pl->plin

31 files changed, 262 insertions, 220 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index be918f327..50a7e8aa6 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -23,3 +23,23 @@ smbserver.py
 curl_test_data.py
 negtelnetserver.py
 *.port
+convsrctest.pl
+disable-scan.pl
+error-codes.pl
+extern-scan.pl
+ftpserver.pl
+http2-server.pl
+httpserver.pl
+keywords.pl
+manpage-scan.pl
+mem-include-scan.pl
+memanalyze.pl
+nroff-scan.pl
+rtspserver.pl
+runtests.pl
+secureserver.pl
+sshserver.pl
+symbol-scan.pl
+testcurl.pl
+tftpserver.pl
+version-scan.pl
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c6fe764b3..7a0baa77c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,15 +22,15 @@
 
 MANDISTPAGES = runtests.1.dist testcurl.1.dist
 
-ED_1 = ftpserver.pl httpserver.pl secureserver.pl runtests.pl
-ED_2 = getpart.pm FILEFORMAT.md README stunnel.pem memanalyze.pl testcurl.pl
-ED_3 = valgrind.pm ftp.pm sshserver.pl sshhelp.pm pathhelp.pm testcurl.1 runtests.1
-ED_4 = serverhelp.pm tftpserver.pl rtspserver.pl directories.pm symbol-scan.pl
-ED_5 = CMakeLists.txt mem-include-scan.pl valgrind.supp extern-scan.pl
-ED_6 = manpage-scan.pl nroff-scan.pl http2-server.pl dictserver.py.in
+ED_1 = ftpserver.pl.in httpserver.pl.in secureserver.pl.in runtests.pl.in
+ED_2 = getpart.pm FILEFORMAT.md README stunnel.pem memanalyze.pl.in testcurl.pl.in
+ED_3 = valgrind.pm ftp.pm sshserver.pl.in sshhelp.pm pathhelp.pm testcurl.1 runtests.1
+ED_4 = serverhelp.pm tftpserver.pl.in rtspserver.pl.in directories.pm symbol-scan.pl.in
+ED_5 = CMakeLists.txt mem-include-scan.pl.in valgrind.supp extern-scan.pl.in
+ED_6 = manpage-scan.pl.in nroff-scan.pl.in http2-server.pl.in dictserver.py.in
 ED_7 = negtelnetserver.py.in smbserver.py.in curl_test_data.py.in objnames-test08.sh objnames-test10.sh
-ED_8 = objnames.inc disable-scan.pl error-codes.pl
-ED_9 = badsymbols.pl azure.pm appveyor.pm version-scan.pl
+ED_8 = objnames.inc disable-scan.pl.in error-codes.pl.in
+ED_9 = badsymbols.pl.in azure.pm appveyor.pm version-scan.pl.in
 
 EXTRA_DIST = $(ED_1) $(ED_2) $(ED_3) $(ED_4) $(ED_5) $(ED_6) $(ED_7) $(ED_8) $(ED_9)
 
@@ -57,8 +57,34 @@ PERLFLAGS = -I$(srcdir)
 CLEANFILES = .http.pid .https.pid .ftp.pid .ftps.pid $(MANDISTPAGES)
 
 do_subst = $(AWK) -v python=$(PYTHON) '{gsub("AWKPYTHON",python,$$0); print $$0}'
+do_subst_perl = $(AWK) -v perl=$(PERL) '{gsub("AWKPERL",perl,$$0); print $$0}'
 
-SUFFIXES = .py.in .py
+SUFFIXES = .py.in .py .pl.in .pl
+
+.pl.in.pl:
+	$(do_subst_perl) < $< > $@
+	@chmod +x $@
+
+# convsrctest.pl.in
+# disable-scan.pl.in
+# error-codes.pl.in
+# extern-scan.pl.in
+# ftpserver.pl.in
+# http2-server.pl.in
+# httpserver.pl.in
+# keywords.pl.in
+# manpage-scan.pl.in
+# mem-include-scan.pl.in
+# memanalyze.pl.in
+# nroff-scan.pl.in
+# rtspserver.pl.in
+# runtests.pl.in
+# secureserver.pl.in
+# sshserver.pl.in
+# symbol-scan.pl.in
+# testcurl.pl.in
+# tftpserver.pl.in
+# version-scan.pl.in
 
 .py.in.py:
 	$(do_subst) < $< > $@
diff --git a/tests/badsymbols.pl.in b/tests/badsymbols.pl.in
index c088528bc..2d1032e09 100755
--- a/tests/badsymbols.pl.in
+++ b/tests/badsymbols.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/certs/Server-localhost-firstSAN-sv.crl b/tests/certs/Server-localhost-firstSAN-sv.crl
index 003ef34f0..0a275841f 100644
--- a/tests/certs/Server-localhost-firstSAN-sv.crl
+++ b/tests/certs/Server-localhost-firstSAN-sv.crl
@@ -1,17 +1,13 @@
 -----BEGIN X509 CRL-----
-MIICpjCCAY4CAQEwDQYJKoZIhvcNAQEFBQAwaDELMAkGA1UEBhMCTk4xMTAvBgNV
-BAoMKEVkZWwgQ3VybCBBcmN0aWMgSWxsdWRpdW0gUmVzZWFyY2ggQ2xvdWQxJjAk
-BgNVBAMMHU5vcnRoZXJuIE5vd2hlcmUgVHJ1c3QgQW5jaG9yFw0xOTExMTcxODA4
-NTBaFw0xOTEyMTcxODA4NTBaMIHhMBcCBg5Oog1ZFRcNMTkxMTA3MDEwODIyWjAX
-AgYOTqINWYgXDTE5MTEwNzAxMDgyMlowFwIGDk6iDWRfFw0xOTExMDcwMTA4MjJa
-MBcCBg5Oog1moBcNMTkxMTA3MDEwODIyWjAXAgYOTqINbBoXDTE5MTEwNzAxMDgy
-MlowFwIGDlDJcrAMFw0xOTExMTcxODA2MzFaMBcCBg5QyX0TNxcNMTkxMTE3MTgw
-NzM4WjAXAgYOUMmBxV8XDTE5MTExNzE4MDgwOVowFwIGDlDJiAXZFw0xOTExMTcx
-ODA4NTBaoA4wDDAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQUFAAOCAQEAvI4IHBRy
-4tLKxu/Lu3a+WwpNxxkMiBjRvBU8Le2S4nVuCREei2gDN70TJ6bhhn0j1c0ivM7/
-WBQbqM0p1i6LughTDs3cyfTPF7lkJ7GEezd9+rcQmRppB9BLK6VROEU2hEseM84S
-RQzwemgS8bfRPV8wghbr7uCkxZ8aGBmMpKx1a/QtsuMoT8BueQnfJ35wZMXGZ+aY
-zmjFpAPHVjsiFzpGbz7vrvtfGhMBl+SZXSc6c0hI5I5Q2DkU/t/j/HYc5lQYVhED
-pxwtC+EXRFmyNHjNk8aKMjATqdp4jyJLWFwQYdDd2EV8O8a5sXygpYZ69YfzZVk2
-dynZozgOvKK9Yg==
+MIIB9TCB3gIBATANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJOTjExMC8GA1UE
+CgwoRWRlbCBDdXJsIEFyY3RpYyBJbGx1ZGl1bSBSZXNlYXJjaCBDbG91ZDEmMCQG
+A1UEAwwdTm9ydGhlcm4gTm93aGVyZSBUcnVzdCBBbmNob3IXDTIwMDQzMDE5NDEy
+M1oXDTIwMDUzMDE5NDEyM1owMjAXAgYOcf2Se/sXDTIwMDQzMDE5MjcxMlowFwIG
+DnH+FAxkFw0yMDA0MzAxOTQxMjNaoA4wDDAKBgNVHRQEAwIBATANBgkqhkiG9w0B
+AQUFAAOCAQEAz2EJhah8YiAAUxB3PnnW9o1Bk9DgLdQvnEmozPF4BHCRGQn4ZMpz
+WmXOxz2kbbmRHepBo0NB5MaidXvO+H2eDbAJoEAG0ZgjoVYIY9Cseo2CuC+EB2kx
+m7jepQ71/p6YSTjXnMaIe1yZrB0xOGaMFSekrixM+3z5MG6oNts7GF8fCYorPhe3
+rne/FHxX/p95YZiLyj+mqN8EFuhnf3DbC24pm2VHXlu202XeixlJrc7Eqq/pxji4
++XQ47k/ze2hcyvtvezbwNem1rvieqYZXIixU3cebU8exdLctQpaEsn283TniS1o9
+95q4uEoDVVZ4/BwHOpZEDb31tn4/6Y51tg==
 -----END X509 CRL-----
diff --git a/tests/certs/Server-localhost-firstSAN-sv.crt b/tests/certs/Server-localhost-firstSAN-sv.crt
index a19591a9f..a565c6718 100644
--- a/tests/certs/Server-localhost-firstSAN-sv.crt
+++ b/tests/certs/Server-localhost-firstSAN-sv.crt
@@ -1,15 +1,15 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 15740141307353 (0xe50c98805d9)
+        Serial Number: 15882756820068 (0xe71fe140c64)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer:
             countryName               = NN
             organizationName          = Edel Curl Arctic Illudium Research Cloud
             commonName                = Northern Nowhere Trust Anchor
         Validity
-            Not Before: Nov 17 18:08:50 2019 GMT
-            Not After : Feb  3 18:08:50 2028 GMT
+            Not Before: Apr 30 19:41:23 2020 GMT
+            Not After : Jul 17 19:41:23 2028 GMT
         Subject:
             countryName               = NN
             organizationName          = Edel Curl Arctic Illudium Research Cloud
@@ -18,24 +18,24 @@ Certificate:
             Public Key Algorithm: rsaEncryption
                 RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:da:d5:8c:14:dd:34:a6:98:1a:40:bc:90:3b:34:
-                    6b:ce:20:ed:46:67:47:f9:2e:18:42:58:04:ed:93:
-                    06:12:d7:77:ac:fb:f0:10:7d:72:d8:48:fa:8c:ab:
-                    25:ad:ee:35:f9:eb:e9:0f:ba:56:b1:13:fe:e5:a0:
-                    04:3c:a5:f2:d2:80:66:68:1a:e3:4b:5d:11:d2:26:
-                    da:a6:80:d6:c8:9e:b3:74:06:5f:ff:2d:38:ac:fb:
-                    29:6e:de:70:57:1c:f3:f6:f7:10:88:43:53:09:a7:
-                    85:c9:55:5c:73:64:f5:e4:55:0e:fa:df:d6:12:47:
-                    05:62:b2:d9:41:c1:81:47:be:c7:53:06:e5:ae:39:
-                    24:a5:e3:4d:c4:3c:e8:38:c3:92:f0:a0:b5:ea:f5:
-                    b8:13:d1:11:77:57:38:7e:a4:2a:9a:96:4a:7e:37:
-                    40:5c:88:b3:6b:cc:3c:b7:80:3c:f1:3a:23:ef:fe:
-                    86:40:a1:8c:d0:26:85:e6:47:8a:8d:0b:e9:b7:8f:
-                    f0:02:12:bb:c4:4e:06:a0:a4:3d:38:af:91:1d:5d:
-                    da:bf:61:74:a9:36:d0:55:bd:9a:4d:fc:6b:0f:b2:
-                    b2:2f:2b:e2:ca:cc:de:bc:09:11:93:8e:78:9c:cf:
-                    57:5f:cb:c1:27:6c:e3:f4:96:b8:53:ed:5e:b4:b7:
-                    e3:93
+                    00:cd:b3:7c:c4:82:4e:77:0a:2a:6f:ec:67:36:06:
+                    8b:6a:5b:b8:78:1f:2b:bd:e1:6b:77:25:f2:89:3e:
+                    5d:fb:00:1a:82:8b:3c:cf:ba:64:39:2f:e4:96:19:
+                    64:52:ee:8e:2e:d9:37:1c:9e:cd:fa:de:89:6d:94:
+                    b5:f0:e1:0e:20:4a:64:c9:be:fe:da:6b:00:57:b6:
+                    25:a1:61:63:ac:2c:65:cb:ad:c0:98:b4:56:58:c7:
+                    48:8b:d6:83:5d:a1:21:bc:db:ae:cc:a3:24:ce:40:
+                    51:c6:5c:d1:62:b6:7e:8f:64:91:58:4a:1a:1a:e6:
+                    6d:50:ce:73:84:e9:14:5e:61:2a:be:7e:7e:1c:0d:
+                    cb:ad:49:e6:37:97:c6:a7:62:6f:49:f1:a5:57:61:
+                    e3:a7:29:ea:56:34:33:73:35:56:2c:0f:e8:29:75:
+                    37:d0:53:55:ff:e8:1d:ca:4a:97:9c:07:71:e6:38:
+                    49:0f:ba:c4:6d:9f:41:4e:f5:f2:f2:09:25:96:1a:
+                    c6:1e:c5:b0:c5:3c:d3:20:40:af:5f:ca:cb:13:0f:
+                    d4:93:ae:93:20:ca:e0:4a:a7:23:00:d4:e0:9e:08:
+                    ba:08:26:5f:4b:78:b6:95:80:95:13:d6:1a:f8:ea:
+                    ab:84:36:f2:39:60:6f:4f:69:47:8d:d1:42:4a:b2:
+                    31:4f
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Alternative Name: 
@@ -45,48 +45,48 @@ Certificate:
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
             X509v3 Subject Key Identifier: 
-                1A:98:74:7E:B0:85:E9:C5:72:A3:22:C9:07:D6:1E:7A:01:B4:B3:DB
+                BD:F1:24:D6:5F:49:A2:B2:36:FE:5B:C6:4F:27:4C:D9:A0:55:85:13
             X509v3 Authority Key Identifier: 
                 keyid:12:CA:BA:4B:46:04:A7:75:8A:2C:E8:0E:54:94:BC:12:65:A6:7B:CE
 
             X509v3 Basic Constraints: 
                 CA:FALSE
     Signature Algorithm: sha256WithRSAEncryption
-         12:8a:21:e9:22:ef:af:41:57:50:2d:ac:c9:c4:c6:0b:14:1c:
-         3f:c6:7d:e6:7f:2e:e5:22:91:0e:47:86:fd:e3:5f:cb:bb:4f:
-         92:37:4c:ec:89:c4:f7:d7:74:9f:7e:88:d4:9f:d2:22:0a:d0:
-         02:ca:5d:9c:48:dc:cb:00:41:41:ef:8d:0c:11:b4:71:3f:ba:
-         46:f1:7b:09:79:c5:dc:1c:85:78:d4:cb:1a:32:5c:56:1e:37:
-         9d:b7:72:a7:3e:34:e2:e6:bc:b8:e8:2f:dc:cf:d0:d9:90:a8:
-         99:cd:31:78:bb:fd:66:42:55:a7:06:74:0c:f1:ac:03:50:09:
-         df:60:47:c4:a8:d4:7b:5f:89:cb:fc:58:bd:41:d5:d7:6c:56:
-         96:8a:b2:8b:1b:17:51:2e:b1:47:e3:07:9f:2b:e5:eb:d5:e0:
-         e1:25:b6:d6:bd:8a:bb:12:6e:13:4c:45:8c:87:89:e7:79:02:
-         70:89:45:a4:d7:73:b3:e6:5a:66:98:07:72:78:68:82:ca:9c:
-         bb:0a:02:79:eb:d9:70:5a:3e:f9:d2:02:6f:be:45:35:a4:77:
-         11:ea:f5:67:61:3d:3a:de:3d:05:e2:88:37:0b:be:21:28:04:
-         da:28:bc:02:ae:17:7c:32:d5:b2:c4:36:e6:d8:32:0c:57:e9:
-         4e:6e:e0:2b
+         5a:8b:b4:be:47:71:f8:1b:07:a4:1c:95:a3:4b:6e:21:cc:49:
+         97:de:8c:4a:f6:1d:7e:0c:05:63:dd:00:57:93:cd:1d:fd:5d:
+         af:0b:56:8d:58:df:7d:83:c4:00:ac:91:ba:da:6c:ff:8f:55:
+         9d:de:b4:e8:8c:c1:86:a1:f0:c8:33:d0:ec:3f:9d:28:6e:43:
+         23:f8:e0:4f:8e:9a:b9:c9:29:67:cd:bd:2d:e2:5b:07:0d:7a:
+         30:52:22:b2:47:45:a3:8a:80:b7:a7:6b:f2:79:81:82:e5:18:
+         bf:d4:de:e4:cc:6a:11:ed:b1:a6:d7:42:50:51:10:c2:b9:0b:
+         b4:ed:24:40:98:02:12:ec:99:24:ed:fd:b1:03:be:66:5e:f5:
+         f4:af:85:e2:06:26:07:c6:cf:7e:e2:75:71:e3:f5:f9:6b:98:
+         c2:31:b4:dd:35:05:d0:63:91:d1:54:a3:2c:83:ea:e9:31:7c:
+         e5:7b:79:14:8d:18:70:7d:aa:50:9c:32:ed:af:ec:67:f3:00:
+         9c:14:02:c0:e4:8e:96:a3:cd:ec:05:d0:7a:5c:96:c6:3b:1d:
+         e5:28:34:9e:34:87:dd:64:00:c5:f2:fc:b2:ad:b6:8c:55:65:
+         00:bd:a4:c2:97:67:8e:ea:60:54:e9:5e:30:54:1b:29:67:19:
+         c3:5c:49:b7
 -----BEGIN CERTIFICATE-----
-MIID3jCCAsagAwIBAgIGDlDJiAXZMA0GCSqGSIb3DQEBCwUAMGgxCzAJBgNVBAYT
+MIID3jCCAsagAwIBAgIGDnH+FAxkMA0GCSqGSIb3DQEBCwUAMGgxCzAJBgNVBAYT
 Ak5OMTEwLwYDVQQKDChFZGVsIEN1cmwgQXJjdGljIElsbHVkaXVtIFJlc2VhcmNo
 IENsb3VkMSYwJAYDVQQDDB1Ob3J0aGVybiBOb3doZXJlIFRydXN0IEFuY2hvcjAe
-Fw0xOTExMTcxODA4NTBaFw0yODAyMDMxODA4NTBaMFcxCzAJBgNVBAYTAk5OMTEw
+Fw0yMDA0MzAxOTQxMjNaFw0yODA3MTcxOTQxMjNaMFcxCzAJBgNVBAYTAk5OMTEw
 LwYDVQQKDChFZGVsIEN1cmwgQXJjdGljIElsbHVkaXVtIFJlc2VhcmNoIENsb3Vk
 MRUwEwYDVQQDDAxsb2NhbGhvc3Qubm4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDa1YwU3TSmmBpAvJA7NGvOIO1GZ0f5LhhCWATtkwYS13es+/AQfXLY
-SPqMqyWt7jX56+kPulaxE/7loAQ8pfLSgGZoGuNLXRHSJtqmgNbInrN0Bl//LTis
-+ylu3nBXHPP29xCIQ1MJp4XJVVxzZPXkVQ7639YSRwVistlBwYFHvsdTBuWuOSSl
-403EPOg4w5LwoLXq9bgT0RF3Vzh+pCqalkp+N0BciLNrzDy3gDzxOiPv/oZAoYzQ
-JoXmR4qNC+m3j/ACErvETgagpD04r5EdXdq/YXSpNtBVvZpN/GsPsrIvK+LKzN68
-CRGTjnicz1dfy8EnbOP0lrhT7V60t+OTAgMBAAGjgZ4wgZswLAYDVR0RBCUwI4IJ
+ggEKAoIBAQDNs3zEgk53Cipv7Gc2BotqW7h4Hyu94Wt3JfKJPl37ABqCizzPumQ5
+L+SWGWRS7o4u2Tccns363oltlLXw4Q4gSmTJvv7aawBXtiWhYWOsLGXLrcCYtFZY
+x0iL1oNdoSG8267MoyTOQFHGXNFitn6PZJFYShoa5m1QznOE6RReYSq+fn4cDcut
+SeY3l8anYm9J8aVXYeOnKepWNDNzNVYsD+gpdTfQU1X/6B3KSpecB3HmOEkPusRt
+n0FO9fLyCSWWGsYexbDFPNMgQK9fyssTD9STrpMgyuBKpyMA1OCeCLoIJl9LeLaV
+gJUT1hr46quENvI5YG9PaUeN0UJKsjFPAgMBAAGjgZ4wgZswLAYDVR0RBCUwI4IJ
 bG9jYWxob3N0ggpsb2NhbGhvc3Qxggpsb2NhbGhvc3QyMAsGA1UdDwQEAwIDqDAT
-BgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUGph0frCF6cVyoyLJB9YeegG0
-s9swHwYDVR0jBBgwFoAUEsq6S0YEp3WKLOgOVJS8EmWme84wCQYDVR0TBAIwADAN
-BgkqhkiG9w0BAQsFAAOCAQEAEooh6SLvr0FXUC2sycTGCxQcP8Z95n8u5SKRDkeG
-/eNfy7tPkjdM7InE99d0n36I1J/SIgrQAspdnEjcywBBQe+NDBG0cT+6RvF7CXnF
-3ByFeNTLGjJcVh43nbdypz404ua8uOgv3M/Q2ZComc0xeLv9ZkJVpwZ0DPGsA1AJ
-32BHxKjUe1+Jy/xYvUHV12xWloqyixsXUS6xR+MHnyvl69Xg4SW21r2KuxJuE0xF
-jIeJ53kCcIlFpNdzs+ZaZpgHcnhogsqcuwoCeevZcFo++dICb75FNaR3Eer1Z2E9
-Ot49BeKINwu+ISgE2ii8Aq4XfDLVssQ25tgyDFfpTm7gKw==
+BgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUvfEk1l9JorI2/lvGTydM2aBV
+hRMwHwYDVR0jBBgwFoAUEsq6S0YEp3WKLOgOVJS8EmWme84wCQYDVR0TBAIwADAN
+BgkqhkiG9w0BAQsFAAOCAQEAWou0vkdx+BsHpByVo0tuIcxJl96MSvYdfgwFY90A
+V5PNHf1drwtWjVjffYPEAKyRutps/49Vnd606IzBhqHwyDPQ7D+dKG5DI/jgT46a
+uckpZ829LeJbBw16MFIiskdFo4qAt6dr8nmBguUYv9Te5MxqEe2xptdCUFEQwrkL
+tO0kQJgCEuyZJO39sQO+Zl719K+F4gYmB8bPfuJ1ceP1+WuYwjG03TUF0GOR0VSj
+LIPq6TF85Xt5FI0YcH2qUJwy7a/sZ/MAnBQCwOSOlqPN7AXQelyWxjsd5Sg0njSH
+3WQAxfL8sq22jFVlAL2kwpdnjupgVOleMFQbKWcZw1xJtw==
 -----END CERTIFICATE-----
diff --git a/tests/certs/Server-localhost-firstSAN-sv.csr b/tests/certs/Server-localhost-firstSAN-sv.csr
index 35097f3e8..f692cd375 100644
--- a/tests/certs/Server-localhost-firstSAN-sv.csr
+++ b/tests/certs/Server-localhost-firstSAN-sv.csr
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIICnDCCAYQCAQAwVzELMAkGA1UEBhMCTk4xMTAvBgNVBAoMKEVkZWwgQ3VybCBB
 cmN0aWMgSWxsdWRpdW0gUmVzZWFyY2ggQ2xvdWQxFTATBgNVBAMMDGxvY2FsaG9z
-dC5ubjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANrVjBTdNKaYGkC8
-kDs0a84g7UZnR/kuGEJYBO2TBhLXd6z78BB9cthI+oyrJa3uNfnr6Q+6VrET/uWg
-BDyl8tKAZmga40tdEdIm2qaA1sies3QGX/8tOKz7KW7ecFcc8/b3EIhDUwmnhclV
-XHNk9eRVDvrf1hJHBWKy2UHBgUe+x1MG5a45JKXjTcQ86DjDkvCgter1uBPREXdX
-OH6kKpqWSn43QFyIs2vMPLeAPPE6I+/+hkChjNAmheZHio0L6beP8AISu8ROBqCk
-PTivkR1d2r9hdKk20FW9mk38aw+ysi8r4srM3rwJEZOOeJzPV1/LwSds4/SWuFPt
-XrS345MCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQBNLKHMWOzs1E7qfR/4ns+l
-BKB/wFN2lE3JrFXD2wG5F+EPQtRV41EAZuSHTbCjvcgnx7gwGldMg0y1gu/z45TP
-NbLYfOtlNVR5q76+Vy4YCVSQwxVedbpggE/K6t/rz8Ssl9cpT+ypyYGYEwdvFuqH
-W6A+uEGgreocgRvOJu5fzvwol23OGGyN2uc2XY+gIoO/7I8fYWa6rDZbdmRPJCCh
-AFGYXVPfYeLVCl23Ok9aZfkpiso1WB8pzFEgnn7QX1CRyCibQOSA6qr4X97mXyZK
-YeZXB1lR7KtIZhSnvfrkJfeB+PxOFiyvSqQo+FI7cUr6GGB71I3NUs5r7Hkyx0Ha
+dC5ubjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2zfMSCTncKKm/s
+ZzYGi2pbuHgfK73ha3cl8ok+XfsAGoKLPM+6ZDkv5JYZZFLuji7ZNxyezfreiW2U
+tfDhDiBKZMm+/tprAFe2JaFhY6wsZcutwJi0VljHSIvWg12hIbzbrsyjJM5AUcZc
+0WK2fo9kkVhKGhrmbVDOc4TpFF5hKr5+fhwNy61J5jeXxqdib0nxpVdh46cp6lY0
+M3M1ViwP6Cl1N9BTVf/oHcpKl5wHceY4SQ+6xG2fQU718vIJJZYaxh7FsMU80yBA
+r1/KyxMP1JOukyDK4EqnIwDU4J4IuggmX0t4tpWAlRPWGvjqq4Q28jlgb09pR43R
+QkqyMU8CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQC4UhywSZw0H3kIaiG2LrGO
+JOI4xVe8tnkBawPuz42Bl1PnZztvUvngXTYw4+8Eugup/vKO79RNtaZBC3MEjYtd
+/YUA2aHI0DOeEjT40nODK0UL+9MVp7lFVJFahKDz5TSGuYZHuk6WpZJugsnyc9RV
+oaueWDn47o59M/SPShgG6BmnA4w1Ue3Sb5TjcGxyiPrTFZ+go0m+zRY/db3Ri3/k
+QZ/8U9h14MLhECgdC5IbqfTCwehGgyq/mhbI5vLJRtLkqFf9yusE5wPMrV6gN0En
+j8N1CXpJ4Br5Isb6ry9ityYzVhrluBSSCx2ztf2nekaU2rC9MfAWy7Ab1msK2MEn
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/certs/Server-localhost-firstSAN-sv.der b/tests/certs/Server-localhost-firstSAN-sv.der
index 7d1dd83d4..809b82554 100644
--- a/tests/certs/Server-localhost-firstSAN-sv.der
+++ b/tests/certs/Server-localhost-firstSAN-sv.der
diff --git a/tests/certs/Server-localhost-firstSAN-sv.key b/tests/certs/Server-localhost-firstSAN-sv.key
index 7d81dba5f..41caae174 100644
--- a/tests/certs/Server-localhost-firstSAN-sv.key
+++ b/tests/certs/Server-localhost-firstSAN-sv.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/certs/Server-localhost-firstSAN-sv.pem b/tests/certs/Server-localhost-firstSAN-sv.pem
index 2eb493612..5690f7f05 100644
--- a/tests/certs/Server-localhost-firstSAN-sv.pem
+++ b/tests/certs/Server-localhost-firstSAN-sv.pem
@@ -24,44 +24,44 @@ commonName_value              = localhost.nn
 # the certificate
 # some dhparam
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEogIBAAKCAQEAzbN8xIJOdwoqb+xnNgaLalu4eB8rveFrdyXyiT5d+wAagos8
+z7pkOS/klhlkUu6OLtk3HJ7N+t6JbZS18OEOIEpkyb7+2msAV7YloWFjrCxly63A
+mLRWWMdIi9aDXaEhvNuuzKMkzkBRxlzRYrZ+j2SRWEoaGuZtUM5zhOkUXmEqvn5+
+HA3LrUnmN5fGp2JvSfGlV2HjpynqVjQzczVWLA/oKXU30FNV/+gdykqXnAdx5jhJ
+D7rEbZ9BTvXy8gkllhrGHsWwxTzTIECvX8rLEw/Uk66TIMrgSqcjANTgngi6CCZf
+S3i2lYCVE9Ya+OqrhDbyOWBvT2lHjdFCSrIxTwIDAQABAoIBAAQaL0PQAXaYSk5f
+HZPTP5aIa75hiMLJqxX+OL8J8l/eGak+06Ck6/jD/sALk5ef0FAY3uOAO0VkiMMZ
+syMxqdF1CluHppd+iMw3ArscMRuu6vzL40poVkyA9O5tAcOtQfn9O5gzLLm8SKU3
+FqnsT8vWSpvDJpAgxk9VPrKI33IeXs9q0c5MIAa7PyCRKoNKgTdc8uL5AiPeh8tc
+PxMz/VK1GSTRZG+6ZE+FNdcASCofym7/S7ASn8gFMxc8aBcTXd6XiDPaYipmhV8H
+yQ7ZKONdq5KBhioOK9rZtXNktI6VvF+o071HYY9R7Tup/m3tcqzFvM+9I330QWgT
+dNXQ9rkCgYEA6P1PxVksuuGjA0GsLC3UPtY9xgupQrJq+TDeCDQRDK/jrMmcOHGt
+L+4oZ8EqvFJderrJMAwyiM8ppe+DWyvXr4jcdcmNNIaqxdPQ+Bhkk1c/3+ojgWC1
+/IZv82mxJM2vQZEYmRnzctkcAUJzWvGbt/LkFRidpBx92/cGT5HKV7MCgYEA4gQ9
+9KyQTe8/Gp+uR+y4/C5VOAogOJUH3vOT+mMrPDmw3S2ZrqX6j3a3BbZxsnezplFK
+I+kHYUucXfsQymje0L81ijwI4rnVR48yZE1ttluIFYieVDtpt+M/jJudLokxITnn
+Tk0dSkITYSsMjLn243aa1Dh4g7BTKO3JAcAxMfUCgYA4LILkKPjw4eAEs/vH9xC6
+SbtBGaSokQ3boN2Xir4lme7BxSYmMbo42Sniwh8EorMpGQnSzM4OUCxRdqrr+2kY
+SF4nA/5IkMNxyP0UJAVzxNCAsxn2YpPeG6e4P15XakP8Afi1SR16LkBjSVs4rRIH
+SseVEodHfxsVQrzByHvJowKBgB6GOiPYRmjwHdKnrC70josoasP1wiJCJlz7Aoo3
+aHhqxjMo3G+U5QEJJHC2EibrOa0Fn4C4ERIX1xduN/dOMIF6wW1Y7E5KkL5oXYLk
+XiPZushFujRgDcgS/dssjQ7i4mq9Wjrd+U21HM7rtHcxCmHv+7sboVMPtjt52cLN
+xRcdAoGAdXMCoJ+317oOg94KY1DMqtZ3dnwX8Ean5jD+DzAvmnYrGGlIHvn0HPwB
+p3A0L7a8UXzkC3zMXXoId0lQeiPkv+GQ4YrrQSnD1H/GYZNZkP55fNEchVkPPq9h
+93z+OL22SZkNvskn0GCCZFFXVR+v1150oLj2pwP8gvSTsb1Hau8=
 -----END RSA PRIVATE KEY-----
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 15740141307353 (0xe50c98805d9)
+        Serial Number: 15882756820068 (0xe71fe140c64)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer:
             countryName               = NN
             organizationName          = Edel Curl Arctic Illudium Research Cloud
             commonName                = Northern Nowhere Trust Anchor
         Validity
-            Not Before: Nov 17 18:08:50 2019 GMT
-            Not After : Feb  3 18:08:50 2028 GMT
+            Not Before: Apr 30 19:41:23 2020 GMT
+            Not After : Jul 17 19:41:23 2028 GMT
         Subject:
             countryName               = NN
             organizationName          = Edel Curl Arctic Illudium Research Cloud
@@ -70,24 +70,24 @@ Certificate:
             Public Key Algorithm: rsaEncryption
                 RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:da:d5:8c:14:dd:34:a6:98:1a:40:bc:90:3b:34:
-                    6b:ce:20:ed:46:67:47:f9:2e:18:42:58:04:ed:93:
-                    06:12:d7:77:ac:fb:f0:10:7d:72:d8:48:fa:8c:ab:
-                    25:ad:ee:35:f9:eb:e9:0f:ba:56:b1:13:fe:e5:a0:
-                    04:3c:a5:f2:d2:80:66:68:1a:e3:4b:5d:11:d2:26:
-                    da:a6:80:d6:c8:9e:b3:74:06:5f:ff:2d:38:ac:fb:
-                    29:6e:de:70:57:1c:f3:f6:f7:10:88:43:53:09:a7:
-                    85:c9:55:5c:73:64:f5:e4:55:0e:fa:df:d6:12:47:
-                    05:62:b2:d9:41:c1:81:47:be:c7:53:06:e5:ae:39:
-                    24:a5:e3:4d:c4:3c:e8:38:c3:92:f0:a0:b5:ea:f5:
-                    b8:13:d1:11:77:57:38:7e:a4:2a:9a:96:4a:7e:37:
-                    40:5c:88:b3:6b:cc:3c:b7:80:3c:f1:3a:23:ef:fe:
-                    86:40:a1:8c:d0:26:85:e6:47:8a:8d:0b:e9:b7:8f:
-                    f0:02:12:bb:c4:4e:06:a0:a4:3d:38:af:91:1d:5d:
-                    da:bf:61:74:a9:36:d0:55:bd:9a:4d:fc:6b:0f:b2:
-                    b2:2f:2b:e2:ca:cc:de:bc:09:11:93:8e:78:9c:cf:
-                    57:5f:cb:c1:27:6c:e3:f4:96:b8:53:ed:5e:b4:b7:
-                    e3:93
+                    00:cd:b3:7c:c4:82:4e:77:0a:2a:6f:ec:67:36:06:
+                    8b:6a:5b:b8:78:1f:2b:bd:e1:6b:77:25:f2:89:3e:
+                    5d:fb:00:1a:82:8b:3c:cf:ba:64:39:2f:e4:96:19:
+                    64:52:ee:8e:2e:d9:37:1c:9e:cd:fa:de:89:6d:94:
+                    b5:f0:e1:0e:20:4a:64:c9:be:fe:da:6b:00:57:b6:
+                    25:a1:61:63:ac:2c:65:cb:ad:c0:98:b4:56:58:c7:
+                    48:8b:d6:83:5d:a1:21:bc:db:ae:cc:a3:24:ce:40:
+                    51:c6:5c:d1:62:b6:7e:8f:64:91:58:4a:1a:1a:e6:
+                    6d:50:ce:73:84:e9:14:5e:61:2a:be:7e:7e:1c:0d:
+                    cb:ad:49:e6:37:97:c6:a7:62:6f:49:f1:a5:57:61:
+                    e3:a7:29:ea:56:34:33:73:35:56:2c:0f:e8:29:75:
+                    37:d0:53:55:ff:e8:1d:ca:4a:97:9c:07:71:e6:38:
+                    49:0f:ba:c4:6d:9f:41:4e:f5:f2:f2:09:25:96:1a:
+                    c6:1e:c5:b0:c5:3c:d3:20:40:af:5f:ca:cb:13:0f:
+                    d4:93:ae:93:20:ca:e0:4a:a7:23:00:d4:e0:9e:08:
+                    ba:08:26:5f:4b:78:b6:95:80:95:13:d6:1a:f8:ea:
+                    ab:84:36:f2:39:60:6f:4f:69:47:8d:d1:42:4a:b2:
+                    31:4f
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Alternative Name: 
@@ -97,48 +97,48 @@ Certificate:
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
             X509v3 Subject Key Identifier: 
-                1A:98:74:7E:B0:85:E9:C5:72:A3:22:C9:07:D6:1E:7A:01:B4:B3:DB
+                BD:F1:24:D6:5F:49:A2:B2:36:FE:5B:C6:4F:27:4C:D9:A0:55:85:13
             X509v3 Authority Key Identifier: 
                 keyid:12:CA:BA:4B:46:04:A7:75:8A:2C:E8:0E:54:94:BC:12:65:A6:7B:CE
 
             X509v3 Basic Constraints: 
                 CA:FALSE
     Signature Algorithm: sha256WithRSAEncryption
-         12:8a:21:e9:22:ef:af:41:57:50:2d:ac:c9:c4:c6:0b:14:1c:
-         3f:c6:7d:e6:7f:2e:e5:22:91:0e:47:86:fd:e3:5f:cb:bb:4f:
-         92:37:4c:ec:89:c4:f7:d7:74:9f:7e:88:d4:9f:d2:22:0a:d0:
-         02:ca:5d:9c:48:dc:cb:00:41:41:ef:8d:0c:11:b4:71:3f:ba:
-         46:f1:7b:09:79:c5:dc:1c:85:78:d4:cb:1a:32:5c:56:1e:37:
-         9d:b7:72:a7:3e:34:e2:e6:bc:b8:e8:2f:dc:cf:d0:d9:90:a8:
-         99:cd:31:78:bb:fd:66:42:55:a7:06:74:0c:f1:ac:03:50:09:
-         df:60:47:c4:a8:d4:7b:5f:89:cb:fc:58:bd:41:d5:d7:6c:56:
-         96:8a:b2:8b:1b:17:51:2e:b1:47:e3:07:9f:2b:e5:eb:d5:e0:
-         e1:25:b6:d6:bd:8a:bb:12:6e:13:4c:45:8c:87:89:e7:79:02:
-         70:89:45:a4:d7:73:b3:e6:5a:66:98:07:72:78:68:82:ca:9c:
-         bb:0a:02:79:eb:d9:70:5a:3e:f9:d2:02:6f:be:45:35:a4:77:
-         11:ea:f5:67:61:3d:3a:de:3d:05:e2:88:37:0b:be:21:28:04:
-         da:28:bc:02:ae:17:7c:32:d5:b2:c4:36:e6:d8:32:0c:57:e9:
-         4e:6e:e0:2b
+         5a:8b:b4:be:47:71:f8:1b:07:a4:1c:95:a3:4b:6e:21:cc:49:
+         97:de:8c:4a:f6:1d:7e:0c:05:63:dd:00:57:93:cd:1d:fd:5d:
+         af:0b:56:8d:58:df:7d:83:c4:00:ac:91:ba:da:6c:ff:8f:55:
+         9d:de:b4:e8:8c:c1:86:a1:f0:c8:33:d0:ec:3f:9d:28:6e:43:
+         23:f8:e0:4f:8e:9a:b9:c9:29:67:cd:bd:2d:e2:5b:07:0d:7a:
+         30:52:22:b2:47:45:a3:8a:80:b7:a7:6b:f2:79:81:82:e5:18:
+         bf:d4:de:e4:cc:6a:11:ed:b1:a6:d7:42:50:51:10:c2:b9:0b:
+         b4:ed:24:40:98:02:12:ec:99:24:ed:fd:b1:03:be:66:5e:f5:
+         f4:af:85:e2:06:26:07:c6:cf:7e:e2:75:71:e3:f5:f9:6b:98:
+         c2:31:b4:dd:35:05:d0:63:91:d1:54:a3:2c:83:ea:e9:31:7c:
+         e5:7b:79:14:8d:18:70:7d:aa:50:9c:32:ed:af:ec:67:f3:00:
+         9c:14:02:c0:e4:8e:96:a3:cd:ec:05:d0:7a:5c:96:c6:3b:1d:
+         e5:28:34:9e:34:87:dd:64:00:c5:f2:fc:b2:ad:b6:8c:55:65:
+         00:bd:a4:c2:97:67:8e:ea:60:54:e9:5e:30:54:1b:29:67:19:
+         c3:5c:49:b7
 -----BEGIN CERTIFICATE-----
-MIID3jCCAsagAwIBAgIGDlDJiAXZMA0GCSqGSIb3DQEBCwUAMGgxCzAJBgNVBAYT
+MIID3jCCAsagAwIBAgIGDnH+FAxkMA0GCSqGSIb3DQEBCwUAMGgxCzAJBgNVBAYT
 Ak5OMTEwLwYDVQQKDChFZGVsIEN1cmwgQXJjdGljIElsbHVkaXVtIFJlc2VhcmNo
 IENsb3VkMSYwJAYDVQQDDB1Ob3J0aGVybiBOb3doZXJlIFRydXN0IEFuY2hvcjAe
-Fw0xOTExMTcxODA4NTBaFw0yODAyMDMxODA4NTBaMFcxCzAJBgNVBAYTAk5OMTEw
+Fw0yMDA0MzAxOTQxMjNaFw0yODA3MTcxOTQxMjNaMFcxCzAJBgNVBAYTAk5OMTEw
 LwYDVQQKDChFZGVsIEN1cmwgQXJjdGljIElsbHVkaXVtIFJlc2VhcmNoIENsb3Vk
 MRUwEwYDVQQDDAxsb2NhbGhvc3Qubm4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDa1YwU3TSmmBpAvJA7NGvOIO1GZ0f5LhhCWATtkwYS13es+/AQfXLY
-SPqMqyWt7jX56+kPulaxE/7loAQ8pfLSgGZoGuNLXRHSJtqmgNbInrN0Bl//LTis
-+ylu3nBXHPP29xCIQ1MJp4XJVVxzZPXkVQ7639YSRwVistlBwYFHvsdTBuWuOSSl
-403EPOg4w5LwoLXq9bgT0RF3Vzh+pCqalkp+N0BciLNrzDy3gDzxOiPv/oZAoYzQ
-JoXmR4qNC+m3j/ACErvETgagpD04r5EdXdq/YXSpNtBVvZpN/GsPsrIvK+LKzN68
-CRGTjnicz1dfy8EnbOP0lrhT7V60t+OTAgMBAAGjgZ4wgZswLAYDVR0RBCUwI4IJ
+ggEKAoIBAQDNs3zEgk53Cipv7Gc2BotqW7h4Hyu94Wt3JfKJPl37ABqCizzPumQ5
+L+SWGWRS7o4u2Tccns363oltlLXw4Q4gSmTJvv7aawBXtiWhYWOsLGXLrcCYtFZY
+x0iL1oNdoSG8267MoyTOQFHGXNFitn6PZJFYShoa5m1QznOE6RReYSq+fn4cDcut
+SeY3l8anYm9J8aVXYeOnKepWNDNzNVYsD+gpdTfQU1X/6B3KSpecB3HmOEkPusRt
+n0FO9fLyCSWWGsYexbDFPNMgQK9fyssTD9STrpMgyuBKpyMA1OCeCLoIJl9LeLaV
+gJUT1hr46quENvI5YG9PaUeN0UJKsjFPAgMBAAGjgZ4wgZswLAYDVR0RBCUwI4IJ
 bG9jYWxob3N0ggpsb2NhbGhvc3Qxggpsb2NhbGhvc3QyMAsGA1UdDwQEAwIDqDAT
-BgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUGph0frCF6cVyoyLJB9YeegG0
-s9swHwYDVR0jBBgwFoAUEsq6S0YEp3WKLOgOVJS8EmWme84wCQYDVR0TBAIwADAN
-BgkqhkiG9w0BAQsFAAOCAQEAEooh6SLvr0FXUC2sycTGCxQcP8Z95n8u5SKRDkeG
-/eNfy7tPkjdM7InE99d0n36I1J/SIgrQAspdnEjcywBBQe+NDBG0cT+6RvF7CXnF
-3ByFeNTLGjJcVh43nbdypz404ua8uOgv3M/Q2ZComc0xeLv9ZkJVpwZ0DPGsA1AJ
-32BHxKjUe1+Jy/xYvUHV12xWloqyixsXUS6xR+MHnyvl69Xg4SW21r2KuxJuE0xF
-jIeJ53kCcIlFpNdzs+ZaZpgHcnhogsqcuwoCeevZcFo++dICb75FNaR3Eer1Z2E9
-Ot49BeKINwu+ISgE2ii8Aq4XfDLVssQ25tgyDFfpTm7gKw==
+BgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUvfEk1l9JorI2/lvGTydM2aBV
+hRMwHwYDVR0jBBgwFoAUEsq6S0YEp3WKLOgOVJS8EmWme84wCQYDVR0TBAIwADAN
+BgkqhkiG9w0BAQsFAAOCAQEAWou0vkdx+BsHpByVo0tuIcxJl96MSvYdfgwFY90A
+V5PNHf1drwtWjVjffYPEAKyRutps/49Vnd606IzBhqHwyDPQ7D+dKG5DI/jgT46a
+uckpZ829LeJbBw16MFIiskdFo4qAt6dr8nmBguUYv9Te5MxqEe2xptdCUFEQwrkL
+tO0kQJgCEuyZJO39sQO+Zl719K+F4gYmB8bPfuJ1ceP1+WuYwjG03TUF0GOR0VSj
+LIPq6TF85Xt5FI0YcH2qUJwy7a/sZ/MAnBQCwOSOlqPN7AXQelyWxjsd5Sg0njSH
+3WQAxfL8sq22jFVlAL2kwpdnjupgVOleMFQbKWcZw1xJtw==
 -----END CERTIFICATE-----
diff --git a/tests/certs/Server-localhost-firstSAN-sv.pub.der b/tests/certs/Server-localhost-firstSAN-sv.pub.der
index 9fd11175b..ee06c95a8 100644
--- a/tests/certs/Server-localhost-firstSAN-sv.pub.der
+++ b/tests/certs/Server-localhost-firstSAN-sv.pub.der
diff --git a/tests/certs/Server-localhost-firstSAN-sv.pub.pem b/tests/certs/Server-localhost-firstSAN-sv.pub.pem
index de60f7abf..76c8b5023 100644
--- a/tests/certs/Server-localhost-firstSAN-sv.pub.pem
+++ b/tests/certs/Server-localhost-firstSAN-sv.pub.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2tWMFN00ppgaQLyQOzRr
-ziDtRmdH+S4YQlgE7ZMGEtd3rPvwEH1y2Ej6jKslre41+evpD7pWsRP+5aAEPKXy
-0oBmaBrjS10R0ibapoDWyJ6zdAZf/y04rPspbt5wVxzz9vcQiENTCaeFyVVcc2T1
-5FUO+t/WEkcFYrLZQcGBR77HUwblrjkkpeNNxDzoOMOS8KC16vW4E9ERd1c4fqQq
-mpZKfjdAXIiza8w8t4A88Toj7/6GQKGM0CaF5keKjQvpt4/wAhK7xE4GoKQ9OK+R
-HV3av2F0qTbQVb2aTfxrD7KyLyviyszevAkRk454nM9XX8vBJ2zj9Ja4U+1etLfj
-kwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzbN8xIJOdwoqb+xnNgaL
+alu4eB8rveFrdyXyiT5d+wAagos8z7pkOS/klhlkUu6OLtk3HJ7N+t6JbZS18OEO
+IEpkyb7+2msAV7YloWFjrCxly63AmLRWWMdIi9aDXaEhvNuuzKMkzkBRxlzRYrZ+
+j2SRWEoaGuZtUM5zhOkUXmEqvn5+HA3LrUnmN5fGp2JvSfGlV2HjpynqVjQzczVW
+LA/oKXU30FNV/+gdykqXnAdx5jhJD7rEbZ9BTvXy8gkllhrGHsWwxTzTIECvX8rL
+Ew/Uk66TIMrgSqcjANTgngi6CCZfS3i2lYCVE9Ya+OqrhDbyOWBvT2lHjdFCSrIx
+TwIDAQAB
 -----END PUBLIC KEY-----
diff --git a/tests/convsrctest.pl.in b/tests/convsrctest.pl.in
index 5c70f2139..4061ff3e2 100755
--- a/tests/convsrctest.pl.in
+++ b/tests/convsrctest.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/disable-scan.pl.in b/tests/disable-scan.pl.in
index 45373ca40..12600f336 100755
--- a/tests/disable-scan.pl.in
+++ b/tests/disable-scan.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/error-codes.pl.in b/tests/error-codes.pl.in
index 0d555f667..d9ddbcdfa 100644
--- a/tests/error-codes.pl.in
+++ b/tests/error-codes.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/extern-scan.pl.in b/tests/extern-scan.pl.in
index 99b096ba2..53725dc9b 100755
--- a/tests/extern-scan.pl.in
+++ b/tests/extern-scan.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/ftpserver.pl.in b/tests/ftpserver.pl.in
index 92420ea4b..a70aac9cf 100755
--- a/tests/ftpserver.pl.in
+++ b/tests/ftpserver.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/http2-server.pl.in b/tests/http2-server.pl.in
index 4dbb0d854..2358ad3fa 100755
--- a/tests/http2-server.pl.in
+++ b/tests/http2-server.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/httpserver.pl.in b/tests/httpserver.pl.in
index 58ab5d460..051982243 100755
--- a/tests/httpserver.pl.in
+++ b/tests/httpserver.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/keywords.pl.in b/tests/keywords.pl.in
index a84753ada..798f58194 100755
--- a/tests/keywords.pl.in
+++ b/tests/keywords.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/manpage-scan.pl.in b/tests/manpage-scan.pl.in
index 3384eec25..6402adf02 100755
--- a/tests/manpage-scan.pl.in
+++ b/tests/manpage-scan.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/mem-include-scan.pl.in b/tests/mem-include-scan.pl.in
index 4667f0450..a7ab544ed 100755
--- a/tests/mem-include-scan.pl.in
+++ b/tests/mem-include-scan.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/memanalyze.pl.in b/tests/memanalyze.pl.in
index 8ba3f6dd5..b16172d38 100755
--- a/tests/memanalyze.pl.in
+++ b/tests/memanalyze.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/nroff-scan.pl.in b/tests/nroff-scan.pl.in
index a07d748ad..348934089 100755
--- a/tests/nroff-scan.pl.in
+++ b/tests/nroff-scan.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/rtspserver.pl.in b/tests/rtspserver.pl.in
index 315526a93..83d24b7fe 100755
--- a/tests/rtspserver.pl.in
+++ b/tests/rtspserver.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/runtests.pl.in b/tests/runtests.pl.in
index f37e157f4..2b9650b69 100755
--- a/tests/runtests.pl.in
+++ b/tests/runtests.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/secureserver.pl.in b/tests/secureserver.pl.in
index c525ef7d8..59234aed1 100755
--- a/tests/secureserver.pl.in
+++ b/tests/secureserver.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/sshserver.pl.in b/tests/sshserver.pl.in
index 1874b9388..0190281c2 100644
--- a/tests/sshserver.pl.in
+++ b/tests/sshserver.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/symbol-scan.pl.in b/tests/symbol-scan.pl.in
index 45c662fac..2d2c5e20e 100755
--- a/tests/symbol-scan.pl.in
+++ b/tests/symbol-scan.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/testcurl.pl.in b/tests/testcurl.pl.in
index 5f2b7b168..b1008f606 100755
--- a/tests/testcurl.pl.in
+++ b/tests/testcurl.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/tftpserver.pl.in b/tests/tftpserver.pl.in
index a7b9b39df..891b0ec40 100755
--- a/tests/tftpserver.pl.in
+++ b/tests/tftpserver.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/version-scan.pl.in b/tests/version-scan.pl.in
index 788ba0fa3..7c56d0501 100755
--- a/tests/version-scan.pl.in
+++ b/tests/version-scan.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!AWKPERL
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |