From 51c714bfb5d25f9957a0590ca9f060ba04d9ccbf Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Mon, 1 Nov 2021 13:35:01 -0700
Subject: [PATCH] Tools: Fetch IANA data over HTTPS.

---
 tools/make-services.py | 8 +++-----
 tools/make-sminmpec.pl | 8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tools/make-services.py b/tools/make-services.py
index a14bea41b6..1782d87364 100755
--- a/tools/make-services.py
+++ b/tools/make-services.py
@@ -9,7 +9,7 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-iana_svc_url = 'http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.csv'
+iana_svc_url = 'https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.csv'
 
 __doc__ = '''\
 Usage: make-services.py [url]
@@ -23,7 +23,6 @@ import getopt
 import csv
 import re
 import collections
-
 import urllib.request, urllib.error, urllib.parse
 import codecs
 
@@ -55,7 +54,6 @@ def port_to_str(port):
     return str(port[0])
 
 def parse_rows(svc_fd):
-    lines = []
     port_reader = csv.reader(svc_fd)
     count = 0
 
@@ -158,10 +156,10 @@ def main(argv):
         sys.exit(2)
 
     try:
-        opts, args = getopt.getopt(argv, "h", ["help"])
+        opts, _ = getopt.getopt(argv, "h", ["help"])
     except getopt.GetoptError:
         exit_msg()
-    for opt, arg in opts:
+    for opt, _ in opts:
         if opt in ("-h", "--help"):
             exit_msg(None, 0)
 
diff --git a/tools/make-sminmpec.pl b/tools/make-sminmpec.pl
index 3d4856fac8..432d794f1b 100755
--- a/tools/make-sminmpec.pl
+++ b/tools/make-sminmpec.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # create the enterprises file from
-# http://www.iana.org/assignments/enterprise-numbers
+# https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
 #
 # Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald@wireshark.org>
@@ -17,7 +17,7 @@ chdir($root_dir) || die("Can't find $root_dir");
 
 my $in = shift;
 
-$in = "http://www.iana.org/assignments/enterprise-numbers" unless(defined $in);
+$in = "https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers" unless(defined $in);
 
 my @in_lines;
 my $revision = '2014-04-27';
@@ -25,7 +25,7 @@ my $revision = '2014-04-27';
 my $min_entries = 100;
 my $smi_total = 0;
 
-if($in =~ m/^http:/i) {
+if($in =~ m/^https?:/i) {
 	eval "require LWP::UserAgent;";
 	die "LWP isn't installed. It is part of the standard Perl module libwww." if $@;
 
@@ -81,7 +81,7 @@ open OUT, "> enterprises.tsv";
 
 print OUT <<"_SMINMPEC";
 #
-# generated from http://www.iana.org/assignments/enterprise-numbers
+# generated from https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
 # run "tools/make-sminmpec.pl [infile]" to regenerate
 #
 # The format used here is: <NUMERICAL_ID><SPACE><NAME>