@@ -, +, @@ 
 compatibility with modern openssl configurations
---
--- spamassassin-3.4.2/t/data/etc/testhost.cert	
+++ spamassassin-3.4.2/t/data/etc/testhost.cert	
@@ -1,23 +1,25 @@ 
 -----BEGIN CERTIFICATE-----
-MIIDyjCCAzOgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBpTELMAkGA1UEBhMCU0Ex
-CzAJBgNVBAgTAlNBMRowGAYDVQQHExFTcGFtQXNzYXNzaW4gQ2l0eTEVMBMGA1UE
-ChMMU3BhbUFzc2Fzc2luMRkwFwYDVQQLExBGT1IgVEVTVElORyBPTkxZMRIwEAYD
-VQQDEwlsb2NhbGhvc3QxJzAlBgkqhkiG9w0BCQEWGHNwYW1hc3Nhc3NpbkBleGFt
-cGxlLmNvbTAeFw0wNDA3MDkyMTE4NDdaFw0yNDA3MTQyMTE4NDdaMIGlMQswCQYD
-VQQGEwJTQTELMAkGA1UECBMCU0ExGjAYBgNVBAcTEVNwYW1Bc3Nhc3NpbiBDaXR5
-MRUwEwYDVQQKEwxTcGFtQXNzYXNzaW4xGTAXBgNVBAsTEEZPUiBURVNUSU5HIE9O
-TFkxEjAQBgNVBAMTCWxvY2FsaG9zdDEnMCUGCSqGSIb3DQEJARYYc3BhbWFzc2Fz
-c2luQGV4YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1l6To
-Fxkyc2glblqZYFq/BWFSMKh9LsouTVowuxC7yQkEENBjeQ4paHUFsi49s0RnabsA
-D1c56O8BBT0C89CMiCubRbv/KyHMDut5Nt0brWKS+VRWHgN9T5eYOy3wKPwbc7bm
-sPdgt5bOCS78F0luL5T6DPcf5mgE7XAv8qp+mwIDAQABo4IBBjCCAQIwHQYDVR0O
-BBYEFGJWfa4QHDeC9Wn3UNLIaf7prjmUMIHSBgNVHSMEgcowgceAFGJWfa4QHDeC
-9Wn3UNLIaf7prjmUoYGrpIGoMIGlMQswCQYDVQQGEwJTQTELMAkGA1UECBMCU0Ex
-GjAYBgNVBAcTEVNwYW1Bc3Nhc3NpbiBDaXR5MRUwEwYDVQQKEwxTcGFtQXNzYXNz
-aW4xGTAXBgNVBAsTEEZPUiBURVNUSU5HIE9OTFkxEjAQBgNVBAMTCWxvY2FsaG9z
-dDEnMCUGCSqGSIb3DQEJARYYc3BhbWFzc2Fzc2luQGV4YW1wbGUuY29tggEAMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAsKbOfgXZlBm1rQlM6W2Nxf5g
-r3QA67liZjVxhIb9chvreCttoe3IkHRSM4axToeKo+x7IV6ceXnqMc5chnu2lUmH
-2z7m3IYRYmIOaXroXZcfqX/P4HMw9NOphpEZ4yNsvKSl2n3h3bJ3ErqxMgghlTGD
-KYC+xKTFTsPjOE53Jh8=
+MIIEQzCCAyugAwIBAgIUP4Qnk8oORtOwMU/uhodmYe+xPp4wDQYJKoZIhvcNAQEL
+BQAwgbAxCzAJBgNVBAYTAlNBMQswCQYDVQQIDAJTQTEaMBgGA1UEBwwRU3BhbUFz
+c2Fzc2luIENpdHkxIDAeBgNVBAoMF1N1YmplY3Q6IEMgU3BhbUFzc2Fzc2luMRkw
+FwYDVQQLDBBGT1IgVEVTVElORyBPTkxZMRIwEAYDVQQDDAlsb2NhbGhvc3QxJzAl
+BgkqhkiG9w0BCQEWGHNwYW1hc3Nhc3NpbkBleGFtcGxlLmNvbTAeFw0xOTEwMTYx
+OTA5MzVaFw0xOTExMTUxOTA5MzVaMIGwMQswCQYDVQQGEwJTQTELMAkGA1UECAwC
+U0ExGjAYBgNVBAcMEVNwYW1Bc3Nhc3NpbiBDaXR5MSAwHgYDVQQKDBdTdWJqZWN0
+OiBDIFNwYW1Bc3Nhc3NpbjEZMBcGA1UECwwQRk9SIFRFU1RJTkcgT05MWTESMBAG
+A1UEAwwJbG9jYWxob3N0MScwJQYJKoZIhvcNAQkBFhhzcGFtYXNzYXNzaW5AZXhh
+bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk+31wVs+j
+LQKt3fr5Kjp9s+WKBcLHfs2fdi7zm/BJnxgBgDsa9WkX05LR6gdapewyp0NaGHnS
+yc1nGmoR1PHXlum7CaL7FUzLXMvi9/M7YG096osqKGvHBgU92fnIoCOl+FNfKbJd
+5Wj6XRcj15/GojHl0FKrDpO2Ozv/HZQ5mISCx7SDsTvg59cDNS9aschsS2i3/7ei
+Ni6oqQ6CS/MNH+kD0necbMKltCNLryrVKsMxEub7ieJpR0qmid4NxMINed/83OZP
+dLPczLu40Y9qwreY/wYGqpxQz+omgWpa/6+HDnnXroKU4ySvdzXPTvdrO4fjYOds
+jOhfMbs+6YbjAgMBAAGjUzBRMB0GA1UdDgQWBBTYleblsSRUmhqo/UZPTkVh7+gy
+NjAfBgNVHSMEGDAWgBTYleblsSRUmhqo/UZPTkVh7+gyNjAPBgNVHRMBAf8EBTAD
+AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAAQJasCzHGSUrGOBC5t20L2p+fKeSCS3qp
+VspGGImcaqmI6r9rglMhm4uEXT6voGu0FxBiDo8dHuYt+Tf6pwhGqWCL7jU1MDL4
+387bo2t+L/+dzHDaej4DYR4kIYmcuGOKjgKOz/RNWbvlBKryTwYGjY8vDEQe1BGO
+wRXYgTfOZmKLFfvrDm4UqbTNETg1cHDy1ybKsWwbPeuPq6t8zS7DVY08cRnIIY17
+3DBqiQaHVk2DCCqv53gqjE0qD3dfqzfIWeS7sa4UT8KCQvy9miJZz0GjWid1Eku0
+ZgwE5Iv++I3YUhz0I5cSuvNTi2C4Q/BwFFm3vDURsSU7ydGaASo/
 -----END CERTIFICATE-----
--- spamassassin-3.4.2/t/data/etc/testhost.key	
+++ spamassassin-3.4.2/t/data/etc/testhost.key	
@@ -1,15 +1,28 @@ 
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC1l6ToFxkyc2glblqZYFq/BWFSMKh9LsouTVowuxC7yQkEENBj
-eQ4paHUFsi49s0RnabsAD1c56O8BBT0C89CMiCubRbv/KyHMDut5Nt0brWKS+VRW
-HgN9T5eYOy3wKPwbc7bmsPdgt5bOCS78F0luL5T6DPcf5mgE7XAv8qp+mwIDAQAB
-AoGAXyirQvAvxQ9TCSJuGaezhhxkpnRXJtppGqBwXc75ct5jehzxht79+9cAU87O
-ioixlNuEIgDn/bHB5TAAi9aGduwz9hsv4NpNQ89/z7tmRKq43QFpf9hFHxZ3Q4e9
-Hmey7ZsJ3/TpqFNfhH0IkLy6fA5+iClss3b2/6BbqqL8drkCQQDb9TSAJW56LnY2
-aRtImgEyoeg2iEgV98SuDvNNUpTYvG0pkFolFlhb49w5KCmKqOtPA+etc/K2vRJf
-8zkfz/BnAkEA01kVZoojg/am0K184Qfotxr7+t8Rjxn4k4g6Eq7ryth/Uicffixx
-9E9sp2aadEW+Lt5pao+BsIwxxtLhphkPrQJBALQi1KQ+A4Q8mMNmwNlshp6Yyjwe
-0Cpth72ksM0aXJxDdIMdnTXSXvqiWbDVm2/bdxp28D21P4k4vtulrZrICPECQQDP
-RzhQ57wrSXWThgLK5KndIy7sfWhIM81yTBHAjyOcPraoSMx/P3HHjTnf+CYVUO1U
-JDe5FeO41dZfzCUYdM3FAkA8IXYe74FVG9VM9yzZYbZHaS17TCyztkqagIuUBfDe
-g0frip4VCEHvh+qDk678GZ1tMJ30utuTx6JgXJ5HeuFi
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCk+31wVs+jLQKt
+3fr5Kjp9s+WKBcLHfs2fdi7zm/BJnxgBgDsa9WkX05LR6gdapewyp0NaGHnSyc1n
+GmoR1PHXlum7CaL7FUzLXMvi9/M7YG096osqKGvHBgU92fnIoCOl+FNfKbJd5Wj6
+XRcj15/GojHl0FKrDpO2Ozv/HZQ5mISCx7SDsTvg59cDNS9aschsS2i3/7eiNi6o
+qQ6CS/MNH+kD0necbMKltCNLryrVKsMxEub7ieJpR0qmid4NxMINed/83OZPdLPc
+zLu40Y9qwreY/wYGqpxQz+omgWpa/6+HDnnXroKU4ySvdzXPTvdrO4fjYOdsjOhf
+Mbs+6YbjAgMBAAECggEAYl9GM0a/9fbvowY6EHmaeLtcgYjf1B4Ksys/4ae4hd1j
+7fksxO1RpZBU+e9GRUmr5aQQJ9dyRDppzDFWz50eOsNUSF79nCLeMF/7fjEECgJ8
+ALAqHJAPe5NearvfET5TIzJHW/W70frpNmdtVcTLEyBBClvF/xLpBn6ZTouvhwsx
+cMwoT39zKOTi5oWHMD26ttyVXinArT/uC+g80WmRGL3tE1HqYROtjAXCSx+kIA0I
+pus7tL55WraPEGeY1dd2EKbG+Qmioa0GT8Y9KM/AcmpSnBlzbAM0ODj8G/I9A2g0
+AxMN8PtyVrJJihwumn+C4Wp9RxHE0s6rmRwwrZpHKQKBgQDZ09n6Ho7HqDnpOyFT
+Oo8ABEdIMkuO5haTHmFsyoVMaO+poceP7tU8I0GlFEUn2lHN7v8Hx72bDuuh2chN
+Yt1Ezspk33n6zChC93edgohRA7KH/WBQGZlWVBz6KgDtGyKKCDmkfrfFAca68sZG
+KqfIpYTai1HIIDaib7izZzJSHwKBgQDB5OgFdenoE5l4i7SsXMsuT/pZ59bmqOX7
+R63EJzIbPlthtaEG6FX6FlTQbYb1qdJUiDVo5sgACtIlL+Wsb2Q5XhK6HlvJtPIT
+Aym0MAfDXS+BxsP7vs/ngNxkHOAhSVeLtiR4IyMLQellxWE8iU0aBnaA/tah2kcm
+gsv9TZxavQKBgEuih/mVSraA7zrQ0U1489ZppeansBy6P/RthB6mY4qYlT8tcYHE
+yD3NcCnF1A12fRkod11YObnxgFf+qtJUFciilRxZjJ1M7l3yV5JVlMespP0bOaoW
+eWvEYRtsIk4yMdgD6x/28BB0AXFAgyAyB3hgILVR0t/Ob6oPaO7CUnK5AoGAHZ72
+wz7MSSQVYhEVvO9AKwcU2/9LGVncKJM+vKSwRvEzzK2OuBtuZxJaSq0w3P7gnwFg
+B3KaQ0dj60Jx9/HcgdcZTU2uABaglL769AgSZ4oo486VyjPQVzGceb7fjrZBpZph
+3+ieRe3/1ghdXn4rRTqPiA1mhLtv+zYoK75bkJECgYAClbALv7//D/sRV4nUtQ1O
+gSfFPoJB+vAYElbhaAKQRK0RMifGaUywwNcnkPtbr1vVQu3xY9s16D/+q2GEUXux
+JFQySMMKc9K6segEsvC+tLkYkWCQFSGohOe/3YOeh2nRQEoN1J3c8KB+NAXnXJQW
+SJAsoRZJHGT11YI19oxDsQ==
+-----END PRIVATE KEY-----
--- spamassassin-3.4.2/t/spamd_ssl.t	
+++ spamassassin-3.4.2/t/spamd_ssl.t	
@@ -24,7 +24,7 @@ q{ This must be the very last line}, 'la
 
 );
 
-ok (sdrun ("-L --ssl --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert",
-           "--ssl < data/spam/001",
+ok (sdrun ("-L --ssl --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert --port 1783",
+           "--port 1783 --ssl < data/spam/001",
            \&patterns_run_cb));
 ok_all_patterns();
--- spamassassin-3.4.2/t/spamd_ssl_accept_fail.t	
+++ spamassassin-3.4.2/t/spamd_ssl_accept_fail.t	
@@ -25,9 +25,9 @@ q{ This must be the very last line}, 'la
 
 );
 
-ok (start_spamd ("-L --ssl --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert"));
+ok (start_spamd ("-L --ssl --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert --port 1783"));
 ok (spamcrun ("< data/spam/001", \&patterns_run_cb));
-ok (spamcrun ("--ssl < data/spam/001", \&patterns_run_cb));
+ok (spamcrun ("--ssl --port 1783 < data/spam/001", \&patterns_run_cb));
 ok (stop_spamd ());
 
 ok_all_patterns();