Changes for OTP 26

.github/workflows/main.yml

@@ -14,6 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         otp:
+          - "26.2"
+          - "26.1"
+          - "26.0"
           - "25.3"
           - "25.2"
           - "25.1"

ssl/mkcert_altname/README

@@ -23,7 +23,7 @@ Create a new CA using
 
 Create a CSR
 
-# openssl req -new -config ./openssl.cnf -newkey rsa:1024 -nodes -keyout yaws.ppk -out yaws.csr
+# openssl req -new -config ./openssl.cnf -newkey rsa:2048 -nodes -keyout yaws.ppk -out yaws.csr
 
 Sign the csr
 

ssl/mkcert_altname/alice.sni.example.com-cert.pem

@@ -1,24 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEETCCAvmgAwIBAgIJAMJnYN35FfXkMA0GCSqGSIb3DQEBBQUAMIG1MQswCQYD
-VQQGEwJTRTEVMBMGA1UECBMMR29uZHdhbmFsYW5kMREwDwYDVQQHEwhZYXdzdG93
-bjETMBEGA1UEChMKSHliZXIgSW5jLjEbMBkGA1UECxMSSmFuaXRvcmlhbCBzZWN0
-aW9uMR4wHAYDVQQDExVhbGljZS5zbmkuZXhhbXBsZS5jb20xKjAoBgkqhkiG9w0B
-CQEWG25vYm9keUBub3doZXJlLmdvbmR3YW5hbGFuZDAeFw0xNTA5MDEyMDA1MjBa
-Fw0yNTA4MjkyMDA1MjBaMIG1MQswCQYDVQQGEwJTRTEVMBMGA1UECBMMR29uZHdh
-bmFsYW5kMREwDwYDVQQHEwhZYXdzdG93bjETMBEGA1UEChMKSHliZXIgSW5jLjEb
-MBkGA1UECxMSSmFuaXRvcmlhbCBzZWN0aW9uMR4wHAYDVQQDExVhbGljZS5zbmku
-ZXhhbXBsZS5jb20xKjAoBgkqhkiG9w0BCQEWG25vYm9keUBub3doZXJlLmdvbmR3
-YW5hbGFuZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKjcQ5Y7r8d
-etxCvrnj4I+9jZ5mtzErt1wGpnjM06YHetzzOsQCGgt58k+f7PgNMXRxgCoWZcr1
-4WX8DNeRBBCRVneKv8eo5xpLKOFzkN3nKW8g1QfjJmMoE2mX2LHLZz5WLmah8U+u
-0MysQS/ghEKnIFeGbza5sIypqJNukIFqhyvMosksGVwfmMli8Z48pzvyX9ndMo0A
-vbIUZyAfGHIfzlMYfBdSG6h0CrgqP5M8jNMC9YMKQC9Zz6uLAxyYwXndkCVjIRIR
-4Y1yHyBU9CnRFcBTvRnsJ0+Lgj2PEktu33cOgXVOI6EqIlkVh2wuulPwoVXo/fFh
-TL35peHERXMCAwEAAaMiMCAwHgYDVR0RBBcwFYITYm9iLnNuaS5leGFtcGxlLmNv
-bTANBgkqhkiG9w0BAQUFAAOCAQEAHf686TX/Pj18yB57nWdydjyRMiczHeYDXIoJ
-5KnUx7VycjOlBJB3xfRFoCgpVvm8/x03LA3lspta1T5eeTPuazGlc6C43xkKdCMA
-RZaJBwmcpopcDNE1l7SjWb+Fkhvoa3oh9CzZZ+0S5PBbQ4MJevVptXc3LTJ0LQ4z
-bhKQqXuZxqGIEzndP8lSicZDtRtMLYEruS5OG7SIL34WMgkS2sDP36FR2olnlgq8
-FJX1qn1ZFY3mjxniXO2cxtsaAXOrqwJscGTyjpgOzBUo6JtdS4EtgWG/FNpvhePz
-hYNomW11cNmsUuANEoCvaE8gWtqHiTUqUSv+Yd1woOUHHcdzOw==
+MIIEKzCCAxOgAwIBAgIUYRlCFCBC1JfmyLsOLneiEa/MwEEwDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCU0UxFTATBgNVBAgMDEdvbmR3YW5hbGFuZDETMBEGA1UE
+CgwKSHliZXIgSW5jLjEbMBkGA1UECwwSSmFuaXRvcmlhbCBzZWN0aW9uMR4wHAYD
+VQQDDBVhbGljZS5zbmkuZXhhbXBsZS5jb20wHhcNMjMxMjI4MTkyMDI5WhcNMzMx
+MjI1MTkyMDI5WjCBtTELMAkGA1UEBhMCU0UxFTATBgNVBAgTDEdvbmR3YW5hbGFu
+ZDERMA8GA1UEBxMIWWF3c3Rvd24xEzARBgNVBAoTCkh5YmVyIEluYy4xGzAZBgNV
+BAsTEkphbml0b3JpYWwgc2VjdGlvbjEeMBwGA1UEAxMVYWxpY2Uuc25pLmV4YW1w
+bGUuY29tMSowKAYJKoZIhvcNAQkBFhtub2JvZHlAbm93aGVyZS5nb25kd2FuYWxh
+bmQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVU42DMt2eywGSM4xG
+wpc2UGxjUM3Sr6hx+vAWp9cwvLiETZWQe7UuYKBa5G7fdvQvMvy79iUh4fvwGwDb
+bU1u4AkDHEHp3sg1mpoznCbXGpcJOiWLRNesMA5TyBN0pTJfU9ClI/pcaVn/+uV4
+nE8hjC2poRAL1T0tb+mw1XgyhUzM+max9F4pS4WDXmj07b8KWyRwRDianNtP4xqF
+ujuHl+4+vhbGoo0/Nssh5l+wOj+F854Z00VnZB0wZKyoO+khOpTTeMamzkKX4YsS
+BArFpyNBRlPrHBhV4XdjJ7jXSHZD26JLIEKJJZcu1iDFZF0aVzaHostPYPs2KtLj
+wWnVAgMBAAGjcTBvMC0GA1UdEQQmMCSCD3NuaS5leGFtcGxlLmNvbYIRKi5zbmku
+ZXhhbXBsZS5jb20wHQYDVR0OBBYEFHezPcv2y4W1UotBNrTOU8j7Sp9nMB8GA1Ud
+IwQYMBaAFN3myw9smPNd1YD4GX3V+N+jEAoeMA0GCSqGSIb3DQEBCwUAA4IBAQCy
+QvzZtjeNO0JwMq9Gs+U84wOIAXaQMh2wtiX6mXfo3I1J2ScogNeTQpkBYtawKScX
+8QqJEW3mkfFexTXzmpW5vtvh9VAYluy3/Tw2F8K0wUCaA1RiODd3kmU1Dbge0r4u
+XJJE/zgHjz4HfRBhpODEcWPcYOH6u3nhMDMPRjbWJcLq7u3HfDRrGhUtj3NWLTZ5
+OFVmtweZ1pNWiE2IrsG24gmAXsrdaKN2xU0nwkbWWEl1k4im4GlBGwP451yhagAX
+vSZJ/8cCTveVRrX+4BMau4HiX+JE+0Cd/VMYqX1szG8rAVYPY3gTJ6H/LkwrUvDl
+jnwJATONGg4QGc5psHyf
 -----END CERTIFICATE-----

ssl/mkcert_altname/alice.sni.example.com-key.pem

@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAwqNxDljuvx163EK+uePgj72Nnma3MSu3XAameMzTpgd63PM6
-xAIaC3nyT5/s+A0xdHGAKhZlyvXhZfwM15EEEJFWd4q/x6jnGkso4XOQ3ecpbyDV
-B+MmYygTaZfYsctnPlYuZqHxT67QzKxBL+CEQqcgV4ZvNrmwjKmok26QgWqHK8yi
-ySwZXB+YyWLxnjynO/Jf2d0yjQC9shRnIB8Ych/OUxh8F1IbqHQKuCo/kzyM0wL1
-gwpAL1nPq4sDHJjBed2QJWMhEhHhjXIfIFT0KdEVwFO9GewnT4uCPY8SS27fdw6B
-dU4joSoiWRWHbC66U/ChVej98WFMvfml4cRFcwIDAQABAoIBAAXCNi8ZfH7VDXSE
-2QXA8zzte8oq+dKPm44yeCxsyvpHkGAHJj70XPbn9b5bWfSA12y9ivAz13Eo0zFk
-QrECDl+7HRbOWRw8KBJEFQKOm8Ok+jnae9MO6mzWm7RtFLE19mkGvbq1oeEcp/rW
-Qdt7xg3+ydstFA9HcSzIPD+YbtgVVIqA6duKwyKfaHgDHDJpo5SyTQXEAui5Ut6u
-GrkNY8L6pEAd69B5E5J3pmbQiIvkPXPrepC+1RaptGb713LwdkVf2/tLzhxAAF0v
-wqbjdk+LOYODzMwOQCC3RP3lHxhebbmxPp3SYf2/VK77F34qLJ0W9Xy0h/DPTeCd
-KHK2jaECgYEA76gzPAdtvR/1stmvtPt3LlTYckN2BbTkYEGkduXVzJOcPa5EOYym
-o+h3QtGR2CkB+iD8nfy84/lABVwlpHc+uuUIcZx+tftyVfKJ/yHEMLpOtGEvXk4c
-qP30ejFe83McpcSrMtOTkrCZUq2Zg6sigeReoYjxnPIZzpZMdetqtPECgYEAz+lU
-9rzopseDIuCSmT/nqwdU2WDtfUiRIV3TK1rhz9jqYjPKoYyIV7pH6+H7o/WLl48t
-wPwEgNlx+b+39hwONuy+wn3UhXyIfdl4lWmfycWm8bYbOCGfJbuv5B1WJT/koXQ1
-DpcI4fyrbHoBCQBVIOZzbMRh1tolvDfpQFnEEKMCgYBZm1JMx5pIdIKxdKM10DAn
-qqGjV4XxbElXlDOiIR1neGmaxmXL/sLv1iOBYEpfwDV1CJBroewecTt2xZVtgQh7
-aNdXY2QdNv7xE9Z1BnMMpRx4ZT4IzLv6k7mtVnhiHlA/yuEYB/PNjSpGt5IGoR4t
-4u1fCI0OWZc8nwXHsVYcgQKBgBVFaQTpZOATT25VDYqSSDBuSpcG3KVRtE92mvE3
-lhy+s5Qielu21ggrrcoLT8SBjauO4X56Cjfoh0mm/Lo4OpgR9p5NY13Y1NoTUsvu
-h4OMLj1ShUxj3DVvE1rCSZr8A3clPXxlpWoBgMRTYyG5n/wCt9Jr8RqbLPspuTp1
-NKMDAoGBAMQ3f+cIEB8Q/UgpTGep33Sh0ezNZ5YyZc2yzUBBBHbFFkBlJJ4bgZyK
-4Jwb4c9QdDDIHFETrcGLbgtuK6tKOjyeofb+BCxpdZE2NykXTLfqG1hkENmGB9EY
-1UuRE/SScHURZw1yFrvbP6Ecmor809uBKfrnjeG4ThMzY/umbDTT
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCVU42DMt2eywGS
+M4xGwpc2UGxjUM3Sr6hx+vAWp9cwvLiETZWQe7UuYKBa5G7fdvQvMvy79iUh4fvw
+GwDbbU1u4AkDHEHp3sg1mpoznCbXGpcJOiWLRNesMA5TyBN0pTJfU9ClI/pcaVn/
++uV4nE8hjC2poRAL1T0tb+mw1XgyhUzM+max9F4pS4WDXmj07b8KWyRwRDianNtP
+4xqFujuHl+4+vhbGoo0/Nssh5l+wOj+F854Z00VnZB0wZKyoO+khOpTTeMamzkKX
+4YsSBArFpyNBRlPrHBhV4XdjJ7jXSHZD26JLIEKJJZcu1iDFZF0aVzaHostPYPs2
+KtLjwWnVAgMBAAECggEAAIB4ogd+e61iereOIeG/CNlx186adnoNJp7phiX3wOvt
+cdJh7Yug4wBDobKRVdJsRSlWdJpB6zB7fIXWtaYTI8uAdEB4zzymrxlvKbu9XK0z
+8z29CRAI6oT501nBiPuSJQRe1+M8UOmwuf3BnitmT65NK/wE1glYLIoq/qNlBURw
+miPoMmrJzcBeV2Ah72z+UQhvY1lOCmX+fAx5ck2TAo9UdGvOo5uP6iTe/CeAvRw1
+fulPpw3weKYtgiMlucuiRBuQ0tf2XKlBF/yDPPIxk2RIwal1g6rKfqIL3Y0qB2mM
+ockFM2HPmdSyglthfjcBIU3FJNFq1ggTZOPuytoXWQKBgQDMLU0Hb/pIHUgBG/AF
+8XFpT6hV+lJR8bcOl8zVpRh04+mUvs8S7j7+/+JsKAdNFvQyP0gfk1ZIojx03WF5
+e84rew3djrtoDpHidPBhXm3QKaG4cy7nwAAeWaZCz8F+Yb0SparWfmMe1wkkJxmb
+bucO2eOm6Xl14n5kRPRYFTkibQKBgQC7OkEs5sCV2v8M+6gkLkie7K0WMbmoPVfX
+thnC9PLGMWEJ4UOA5KZc5l749BLrh5vwqNHGvsDz8y8Hjvs5DTWWbknaiLGB5tj9
+7oOk9HcclKD+xbRruywPk5NAqpx5IqN0qe1l64bSKzn71G6HjR8MOQMq+Z9rkZm9
+oOx105uECQKBgQCcBk4jzdVDgGTCvDeqQvv4ju/Da/u2NPE/TI8x/+x1fqjDiyAw
+hjFLqfy7y8bwiQbo0uTphCzeamOqpnXTYOGG5o0M7wKVHPUsSVJcBc4C0Z2MlzCT
+1mwAxV9BFQP28PeMJV8sc/6I1ahdoSd3WMNm3OiTZzzy8bbGJs9V9Dnp7QKBgHg2
+VCifVGIjhYVxg6kPaqNX9V59uOXz1RX0nx/VJJfqlpLAZxY4OTUG2U3hcNB3dsGT
+s3V3fu5jYvvoaxdbit+2mobNI6Pzc7m/Thk4uc3JBIHwsQJG4Ghz6aUopmUEv4yl
+mn7JNfx1srol0H4KNzgi1wzdz+VCTEM8MvcIUh75AoGANj2Pn9OqPBAHxYgAHcoj
+nxgKVUz86Fshzkn196oilA2RSN38vuCo4H9vvvNnY5hQINED+GgquF4KHz6rS8jQ
+Kk8LEF9l+1JzUZzZ1Ksf53bFqEzzm/SwF9xSQpFhNpyRc/3krJNlWFwv/0JCEYWt
+92a1BBZdt3PF+tZUincaL+M=
+-----END PRIVATE KEY-----

ssl/mkcert_altname/openssl.cnf

@@ -67,7 +67,7 @@ cert_opt 	= ca_default		# Certificate field options
 
 default_days	= 3650			# how long to certify for
 default_crl_days= 30			# how long before next CRL
-default_md	= sha1			# which md to use.
+default_md	= sha256		# which md to use.
 preserve	= no			# keep passed DN ordering
 
 # A few difference way of specifying how similar the request should look
@@ -98,7 +98,7 @@ emailAddress		= optional
 
 ####################################################################
 [ req ]
-default_bits		= 1024
+default_bits		= 2048
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes

ssl/mkcert_altname/yaws.sni.example.com-cert.pem

@@ -1,25 +1,26 @@
 -----BEGIN CERTIFICATE-----
-MIIEHjCCAwagAwIBAgIJALteEnfxVLtfMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
-VQQGEwJTRTEVMBMGA1UECBMMR29uZHdhbmFsYW5kMREwDwYDVQQHEwhZYXdzdG93
-bjETMBEGA1UEChMKSHliZXIgSW5jLjEbMBkGA1UECxMSSmFuaXRvcmlhbCBzZWN0
-aW9uMR0wGwYDVQQDExR5YXdzLnNuaS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJ
-ARYbbm9ib2R5QG5vd2hlcmUuZ29uZHdhbmFsYW5kMB4XDTE1MDkwMTIwMTUzNVoX
-DTI1MDgyOTIwMTUzNVowgbQxCzAJBgNVBAYTAlNFMRUwEwYDVQQIEwxHb25kd2Fu
-YWxhbmQxETAPBgNVBAcTCFlhd3N0b3duMRMwEQYDVQQKEwpIeWJlciBJbmMuMRsw
-GQYDVQQLExJKYW5pdG9yaWFsIHNlY3Rpb24xHTAbBgNVBAMTFHlhd3Muc25pLmV4
-YW1wbGUuY29tMSowKAYJKoZIhvcNAQkBFhtub2JvZHlAbm93aGVyZS5nb25kd2Fu
-YWxhbmQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjvvarAiwY3NIP
-IkwP34XklSTZCqzceF82kDEq/0BJJQtLPlolaOWUVcEeEIUQNFBdysgFQbN0S8xH
-GQjXC0Oz73MV+9Ekd6SYIjZuS+aL/ym7SBE4kGQqnwxqD8/lj/O2It2HtFoD1pLW
-tMjNMHvScikQvVJLKIwT+F8Hsn4Yrwt57Sr68wn6+uxhnl96vAEauMMmnrWy+znY
-n+4KNTzvlK2AChJh1KwGbCpiMz37yBlVdsAXpHv8xbJS3BE7++CQxTzqf79zKWly
-g1sZOXokWx71FnDmgHji5DqD3DFaCc4MSe3BuxQy8972GagePdIYM1DZunFSg2Eq
-ed1xuyUrAgMBAAGjMTAvMC0GA1UdEQQmMCSCD3NuaS5leGFtcGxlLmNvbYIRKi5z
-bmkuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQEFBQADggEBAJJXxWatXeVaLJrcnW+t
-SyUhm3FiYG5OQCbV+3YJ8Rhpm2ip3VkQG8ReBOf5G0bm8ok/rDRfZkZAVem3kbcg
-RGZDfcHVRR8DsAOFyu69wA/N89ubvzFmIUk+KS2a1BGeHrxv99dXR7QN02mQvNm2
-FoFNXbR+/SuaqMRDIsMhlcKkQ3h3pua5PFsKsfnvCxFUH3HfOWL3AnZ2RwsFV2Ss
-9Bnq+CmYj9ASKSJZzXfAfYAx7ok6AexEwRvce6pMShUlxu690DRDxLtliE1Y/kuD
-OSHsGFZbf+z2TQprZPOcfn/Z4H75ulru9aTsf5seAUxr/ABTfAXV7WyPx7cI87IO
-WdM=
+MIIEVjCCAz6gAwIBAgIUNvnyesgNk+1so3qeXJ9dX7pPptYwDQYJKoZIhvcNAQEL
+BQAwgaExCzAJBgNVBAYTAlNFMRUwEwYDVQQIDAxHb25kd2FuYWxhbmQxEzARBgNV
+BAoMCkh5YmVyIEluYy4xGzAZBgNVBAsMEkphbml0b3JpYWwgc2VjdGlvbjEdMBsG
+A1UEAwwUeWF3cy5zbmkuZXhhbXBsZS5jb20xKjAoBgkqhkiG9w0BCQEWG25vYm9k
+eUBub3doZXJlLmdvbmR3YW5hbGFuZDAeFw0yMzEyMjgxOTE1MDJaFw0zMzEyMjUx
+OTE1MDJaMIG0MQswCQYDVQQGEwJTRTEVMBMGA1UECBMMR29uZHdhbmFsYW5kMREw
+DwYDVQQHEwhZYXdzdG93bjETMBEGA1UEChMKSHliZXIgSW5jLjEbMBkGA1UECxMS
+SmFuaXRvcmlhbCBzZWN0aW9uMR0wGwYDVQQDExR5YXdzLnNuaS5leGFtcGxlLmNv
+bTEqMCgGCSqGSIb3DQEJARYbbm9ib2R5QG5vd2hlcmUuZ29uZHdhbmFsYW5kMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn08EflJJALTfXKnkn9XzaH9+
+Sf9troawAvdl2db38J43hdF9QX8qk6azrfSqmdaSx/59S+sEiAEygvOwrvpzr10/
+0/mC9LkfR3FiwRyMWaAs2uDcBFx7/OTPY44UiiXX6HzfA1fSc0jsBENRAcJ8Ze3y
+T9IMdJdJrAP8IdoSz4Jw4nhvFPz26D1pL3yeJGDGHhSRoh+mGxvZNyZiYXjDlEjo
+fmsg9sLoC8GIs3AciV6trf04Zu/f3HdD3e4uD29lin9Yge38IrUXrxIPVYOHZ2+u
+eBbcpD517TpjtbOswRkfFfGolpuHMvNJ93BGgtTUcYc5FGi6wDeTE3BujBnz7wID
+AQABo3EwbzAtBgNVHREEJjAkgg9zbmkuZXhhbXBsZS5jb22CESouc25pLmV4YW1w
+bGUuY29tMB0GA1UdDgQWBBTrReJPLBvLKqeSr8VRN+fAvgPgyzAfBgNVHSMEGDAW
+gBQTb+jRUwLSFUWecsCC2v/CWRHZWDANBgkqhkiG9w0BAQsFAAOCAQEABleg+zug
+WVkdUZgGQRCECbxYm4aALpvJmkGMr2nHb5Ulh2HWnQsgHkuKCR0wpR4N79NnhxY3
+J4x7Il4UrXNIRmEJn/hkl2bG29hkVw79BMBwWKiKpSgEIraxmGjQJtmSyk17+T0P
+b58hQTTTejTTzk006qcaTfHWFwZFHpW0F2rTThOxx8XJ3QJU8ThSlcf4Rcq8TmGN
+qlrevR25YFo1NDROmH8v9PCEjRBarsI0h5Ihu6nILeS7wzXedakCoOk/2h5XZZUS
+VxCy7VyIINCg9ZbcnPb3frc/DdMraT8X+S/UdeyBQr9KdRUum4u4ZHaPXOFrE38W
+nPnCNOeSdFvVLA==
 -----END CERTIFICATE-----

ssl/mkcert_altname/yaws.sni.example.com-key.pem

@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAo772qwIsGNzSDyJMD9+F5JUk2Qqs3HhfNpAxKv9ASSULSz5a
-JWjllFXBHhCFEDRQXcrIBUGzdEvMRxkI1wtDs+9zFfvRJHekmCI2bkvmi/8pu0gR
-OJBkKp8Mag/P5Y/ztiLdh7RaA9aS1rTIzTB70nIpEL1SSyiME/hfB7J+GK8Lee0q
-+vMJ+vrsYZ5ferwBGrjDJp61svs52J/uCjU875StgAoSYdSsBmwqYjM9+8gZVXbA
-F6R7/MWyUtwRO/vgkMU86n+/cylpcoNbGTl6JFse9RZw5oB44uQ6g9wxWgnODEnt
-wbsUMvPe9hmoHj3SGDNQ2bpxUoNhKnndcbslKwIDAQABAoIBAGQrwoLDBW8AR5Dy
-jk13lFVN2Ajeuvj0umqKs0l2dUFJ5CrXrhYMocWo4EcgHAbZugBmuQ5eLwYKCKHF
-8t57CaPd7C2aq0r/1jUrWNkInbUvF7x2TfKogl6AhfusSKZK9fCKS7Nk5VxLu/CV
-D/JWoqkPJYgUCW/pEih1XM08qF84W+zxueuPf9DAjmY59qwyis0xrvwPNMVNzICF
-1cfPXQ/7XufwtBN0+GKi9sSRTCLGVVeG5bka8S/J6diwcaFId5G2Xxc/fwY86a6z
-0Rpl9zqVlmDvzcGyP0+vEgvVDAeG8Z2j3snAhLm7FvEXyLIRSvw8URpt9AQsAPzl
-MutXKoECgYEAzsw1HQ1ZAF2UJEhh9d6U7qyeAZB65ZuvuL2p1pFiftqrekTETxKm
-h5iBmXUD86Crm/TGATPX7w7w7WqTS0IZvJuX/Z4zXJ7houiAPt0+yeYSLunC2aVd
-s1fEZNmbBkQv4ZO0YC+Iol+eY8z7HSg/JwHoyYYb6DC/5dt5AAIue9sCgYEAyrSH
-JnCEYe9V4PU+/Ij2oGpl3zQFnieS5/h9wIto8e9CpxdQG2ZqhdihvTFG/P2w704r
-5coGDgXLaR76oLnWig7IQIOAhttbD0h2thSm03yZsWal6yxldBR+3NLYbKvwMDpu
-zd+kfv2OBm+YhDTJvXeOgsnOAFHBZ8oSngn1ZPECgYBkTUG5vJ6dgcX3ry/sXDAq
-b4kXwycItPGPDlcRHmUCmDcxz6bTn30sKXk6oDnxcc2qkBd1v9qNNdb/oICesQng
-pCsdNR0+YEWaiWCinRb2QGQzYuhCPmXrNbepHq6FZI9Avy5utL912iDt0R8/LiUr
-W064aBajEPoSl9fhfC1lnwKBgE38kpqpY2VCbWn1MNx73VbuWG89VoP4eb6hjdAM
-Ur3x7VTX1UwVZRpFtERTtxoSiIYpLx5jUV0HwbCZ6Jb5qJ7I/SZE8afwsOH6YSHA
-ZEatg3wLH/6QwB+e2wgeXoHAzNHhSUwPpPvulTvIp4cFwDAS1VNgTM82pRBHYE5J
-So4hAoGASEUqLUST1djbFaCcwPkXHhx15+wSVgJyJ7dAwQh8GPQnI3lWSPmw1VEB
-+UHW3tNONnKijw2aBuC3rt9sUks1H9RMDHcU+mq9qa9CLB6XArgPet3iaWm0Tkhc
-OW8kuPUVncR9YU6Tpy6vWwNpT1Qjjbm2NruyhmNbyHU+G8CIAps=
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCfTwR+UkkAtN9c
+qeSf1fNof35J/22uhrAC92XZ1vfwnjeF0X1BfyqTprOt9KqZ1pLH/n1L6wSIATKC
+87Cu+nOvXT/T+YL0uR9HcWLBHIxZoCza4NwEXHv85M9jjhSKJdfofN8DV9JzSOwE
+Q1EBwnxl7fJP0gx0l0msA/wh2hLPgnDieG8U/PboPWkvfJ4kYMYeFJGiH6YbG9k3
+JmJheMOUSOh+ayD2wugLwYizcByJXq2t/Thm79/cd0Pd7i4Pb2WKf1iB7fwitRev
+Eg9Vg4dnb654FtykPnXtOmO1s6zBGR8V8aiWm4cy80n3cEaC1NRxhzkUaLrAN5MT
+cG6MGfPvAgMBAAECggEAJi7uSMi4Lq8rii4+WgER4k4MmvfZ9ibaMRvTEa9wpf+G
+F1Dq0LQGJHWkQ2GNMmo3rC/XIEcoQuDmlnSKOKZW7AVRsyDuvnFQifMnVFnfWewG
+VD/o/DKelTLScm4vhh0j7tlfKpH2IyOrTipEVEOlRVkO5wrVaWyJf+1ElWiLcajU
+8hpmzaFC3xSUmntQNRCdx7IHIxFPNi0NAa6eKwVXqMwSnFtMF1+cMAeuhX0/vvt3
+o7jJ66hRUQA4AE7MrRizlT7yZmYP4QMvD2SrD7sJBmi4M815hEZyt6zGtWEveG1Q
+GIwxcWA3Tb7a69TL2gOcQzLzjQLpeRlGWCHjAqis4QKBgQDcMgRn4ANpZcFqeJg1
+XQiG4syVA1S2ox+4oTo12C0+HMM2OUM2vaKKf3j3AQTMKpSbCf0fGE1RQZ9xr2gr
+iVw9Qrws3UaDsdF0eS8pYOQFx95tUFeyMQCPy1MSnDjLTe6Y0AmKp+GQR6gzcjrz
+OC487AF2Cb3MrkGjdwGvhSxhYwKBgQC5Nn5xmJVpx7mKCkVu1c2sKJMraJzf1OA9
+Si2ge2rmLG2V+IbjmHBLj72bt5KrHE8EYJZVmbJyjUIxvcPLLep3x7BFb7ZtTwF+
+RWfpFAKlx7Ih/G72AlVy6Fls1dCXXjo6CTXbFmZhV4nKI7BooMZuu3J8cRsUujxZ
+liuuEZ/PBQKBgQCIVUuXCQLzwfXkNzB+cdCyuz/Rz1MnFY6xYNnKtsMkXuia7Q9p
+mDZILC64OGBBDOgfqiqXkxNkCQ5wdBs6QXzjzSr3WDWtmm5GADYsF3p2/c4Avqrd
+gCuJ3Gjd7+3WKrVc1gniWJl3HHbPC53mM1WlkLZC4DssvIOVczyO8RSOYwKBgFXA
+dESV97+VGENgRAtv9BzcYF89vTwo7HWUDZH68mCFe2tvOMzRfFSPxaL+GGse3TrS
+mWgilCtTWa18BdXheWhhzSwo79amOLPE4LpaaGtnDQONQ7alF/juuNCaIkyi9OR/
+9S5trZMuG366jWez4IvOP9B78aTkISL9U1XxlQMdAoGBALflKKVRmzPEewG3hLHV
+O4sPiJNUOGY7h9TIzQZ1BnlidAGvPbCenXqS0QOybkqksaQ2iMU+1cTGXxtEdExQ
++PPo/fJ6lp4hUbHPEHYiFxGbrV8bI5rNxjuv5pmEjydLq3VQBYYa0lJ6GI7X+DS1
+vv15csGBjqhV03TnYpH0ew+W
+-----END PRIVATE KEY-----

testsuite/dhfile_SUITE.erl

@@ -15,15 +15,50 @@ groups() ->
     [
     ].
 
+%% Skip dhfile tests on broken OTP-26 releases.
+%% Guessing that OTP-26.2.2+ will be fixed.
+-define(OTP26_FIXED_DHFILE, <<"26.2.2">>).
+
+-ifdef(OTP_RELEASE).
+  -if(?OTP_RELEASE == 26).
+otp26_broken_dhfile() ->
+    case otp_release_version("26") of
+        {ok, OtpVsn}
+          when OtpVsn =< ?OTP26_FIXED_DHFILE ->
+            true;
+       _ ->
+            false
+    end.
+  -else.
+otp26_broken_dhfile() ->
+    false.
+  -endif.
+-endif.
+
+otp_release_version(Rel) ->
+    try
+        {ok, _OtpVsn} =
+            file:read_file(filename:join([code:root_dir(), "releases", Rel,
+                                          "OTP_VERSION"]))
+    catch
+        error:{badmatch, _} ->
+            file:read_file(filename:join([code:root_dir(), "OTP_VERSION"]))
+    end.
+
 %%====================================================================
 init_per_suite(Config) ->
-    Id    = "testsuite-server",
-    YConf = filename:join(?tempdir(?MODULE), "yaws.conf"),
-    application:load(yaws),
-    application:set_env(yaws, id,   Id),
-    application:set_env(yaws, conf, YConf),
-    ok = yaws:start(),
-    [{yaws_id, Id}, {yaws_config, YConf} | Config].
+    case otp26_broken_dhfile() of
+        true ->
+            {skip, otp26_broken_dhfile};
+        false ->
+            Id    = "testsuite-server",
+            YConf = filename:join(?tempdir(?MODULE), "yaws.conf"),
+            application:load(yaws),
+            application:set_env(yaws, id,   Id),
+            application:set_env(yaws, conf, YConf),
+            ok = yaws:start(),
+            [{yaws_id, Id}, {yaws_config, YConf} | Config]
+    end.
 
 end_per_suite(_Config) ->
     ok = application:stop(yaws),

testsuite/ssl_sni_SUITE.erl

@@ -12,8 +12,7 @@ all() ->
      sni_strict,
      sni_required_on_vhost,
      sni_not_enabled,
-     sni_without_tls,
-     sni_not_available
+     sni_without_tls
     ].
 
 groups() ->
@@ -62,8 +61,6 @@ init_per_testcase(sni_required_on_vhost, Config) ->
     restart_yaws("yaws_sni_required_on_vhost.conf", Config);
 init_per_testcase(sni_without_tls, Config) ->
     Config;
-init_per_testcase(sni_not_available, _Config) ->
-    {skip, "sni supported on this Erlang/OTP release"};
 init_per_testcase(_Test, Config) ->
     Config.
 
@@ -190,11 +187,6 @@ sni_without_tls(_Config) ->
     ?assertMatch({error, _}, yaws_config:load(Env)),
     ok.
 
-sni_not_available(_Config) ->
-    Env = #env{debug=false, conf={file, ?tempdir(?MODULE) ++ "/yaws_sni_not_available.conf"}},
-    ?assertMatch({error, _}, yaws_config:load(Env)),
-    ok.
-
 %%====================================================================
 restart_yaws(File, Config)->
     YConf = filename:join(?tempdir(?MODULE), File),

testsuite/websockets_SUITE.erl

@@ -1564,7 +1564,9 @@ open(Host, Port) ->
     gen_tcp:connect(Host, Port, Opts).
 
 sslopen(Host, Port) ->
-    Opts = [{send_timeout, 2000}, binary, {packet, raw}, {active, false}],
+    Opts = [{send_timeout, 2000}, binary, {packet, raw}, {active, false},
+            %% TODO update test to use default verify option (verify_peer)
+            {verify, verify_none}],
     case ssl:connect(Host, Port, Opts) of
         {ok, Sock}      -> {ok, {ssl, Sock}};
         {error, Reason} -> {error, Reason}