From 4923effe23a74b6bafa2c7c4d907c1489791ce28 Mon Sep 17 00:00:00 2001 From: Romain Sertelon Date: Wed, 25 Oct 2017 21:14:43 +0200 Subject: [PATCH 1/3] Fixes --with-libiconv-prefix option Should close #2465 Signed-off-by: Romain Sertelon --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 00aa9b4ec..0a8defa40 100644 --- a/configure.ac +++ b/configure.ac @@ -496,7 +496,7 @@ AS_CASE(["$ARG_WITH_LIBICONV"], AC_MSG_RESULT([yes]) AM_ICONV() AS_IF([test "x$am_cv_func_iconv" = "xyes"], [ - ICONV_LIBS=$LTLIBICONV + ICONV_LIBS=$LIBICONV AC_SUBST([ICONV_LIBS]) LIBS="$ICONV_LIBS $LIBS" ], [ From dc612b6423f09361f738429bd567bad582dedb78 Mon Sep 17 00:00:00 2001 From: Steven Siloti Date: Thu, 26 Oct 2017 11:07:37 -0700 Subject: [PATCH 2/3] keep updating aux::time_now() while there are announces This fixes an infinite loop when an announce during shutown fails and aux::time_now() has fallen behind clock_type::now() by more than the delay calculated in announce_entry::failed(). If this happens, announce_entry::can_announce() can forever return true when called from torrent::announce_with_tracker() because that function uses clock_type::now(). Also change torrent::announce_with_tracker() to use aux::time_now() just for consistency with the reset of the announce related functions. --- src/session_impl.cpp | 5 ++++- src/torrent.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/session_impl.cpp b/src/session_impl.cpp index ab2ca1953..cea3ca98a 100644 --- a/src/session_impl.cpp +++ b/src/session_impl.cpp @@ -3052,10 +3052,13 @@ retry: // we have to keep ticking the utp socket manager // until they're all closed + // we also have to keep updating the aux time while + // there are outstanding announces if (m_abort) { if (m_utp_socket_manager.num_sockets() == 0 - && m_undead_peers.empty()) + && m_undead_peers.empty() + && m_tracker_manager.empty()) return; #if defined TORRENT_ASIO_DEBUGGING fprintf(stderr, "uTP sockets left: %d undead-peers left: %d\n" diff --git a/src/torrent.cpp b/src/torrent.cpp index 2319557f7..17f07dc45 100644 --- a/src/torrent.cpp +++ b/src/torrent.cpp @@ -3206,7 +3206,7 @@ namespace { req.num_want = (req.event == tracker_request::stopped) ? 0 : settings().get_int(settings_pack::num_want); - time_point now = clock_type::now(); + time_point now = aux::time_now(); // the tier is kept as INT_MAX until we find the first // tracker that works, then it's set to that tracker's From d9de6767a7d5bda1916f77f883b16345b4cf2035 Mon Sep 17 00:00:00 2001 From: arvidn Date: Sun, 5 Nov 2017 16:46:41 +0100 Subject: [PATCH 3/3] back-port updated ssl test cert from master --- test/ssl/dhparams.pem | 12 +-- test/ssl/peer_certificate.pem | 117 ++++++++++++------------ test/ssl/peer_private_key.pem | 56 ++++++------ test/ssl/regenerate_test_certificate.sh | 4 +- test/ssl/root_ca_cert.pem | 115 ++++++++++++----------- test/ssl/root_ca_private.pem | 56 ++++++------ 6 files changed, 180 insertions(+), 180 deletions(-) diff --git a/test/ssl/dhparams.pem b/test/ssl/dhparams.pem index 715ef4fa3..1f34372f3 100644 --- a/test/ssl/dhparams.pem +++ b/test/ssl/dhparams.pem @@ -1,8 +1,8 @@ -----BEGIN DH PARAMETERS----- -MIIBCAKCAQEAq7oO3jn/8cJSicRlNLLg7aIS/AzkJeJCmRoPRXhPAW0ZS6MP0uld -RBWAT5jp3fc6LjMt1r6AjXriuvHHCfksnacboBqZcUtIlgta0BWK6OTsw/2yjIKD -EBpPCUiuajb2aiuKlZjOLWe837OGg77rYWJ2ntvCuX8DkataS7nsaGOHT+w9IyIE -2ETiYJneDxgrJABu2SF8msDRRvuJIbbfRKRkQeM7pQiM61SPuSDZy11dQkUrxWWI -CYwnUCOLwVHj6CcMpipmIciPC/wu5LwfwuxkgCdm59r2FgnJY9bFv3WbicPLOnsd -eJRt7PfUUKpH04zKwnFFvOCPUndeFnxamwIBAg== +MIIBCAKCAQEAkAw6MH42r7NeMH2PeaHqt+OW+0CznNyUQxXeVl/Rab/hYwsaBiGH +6bm/32zlb9A09g8kZS4vGWY3TJDTaTtNZVAGKPWRqtAlh4YQOy66eFVY0NhEGlHb +ETTJCIaHxY+OphYeV1CvwCtiNIGUW24NORB2DTSj66jTJ2/46LWktIWdn5gYBPoH +e3cXJXEvmnlzfRYgLrOTmYyTtppV2LUrjUuSDvhaulSsuijPv1GNBZlNLVthydZ9 +RbuqOb5RmRqILfuwcgr2YmdufQ0rKxRnMbfKDajBHKxBhwroLL1R923F+uXfzRsg +FN7Je4vnKVrODg9d82TTsxEM7A4XrMn1mwIBAg== -----END DH PARAMETERS----- diff --git a/test/ssl/peer_certificate.pem b/test/ssl/peer_certificate.pem index 98ab0f261..ad084f66f 100644 --- a/test/ssl/peer_certificate.pem +++ b/test/ssl/peer_certificate.pem @@ -1,36 +1,35 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: - fb:31:10:62:a9:61:e5:46 - Signature Algorithm: sha256WithRSAEncryption + Serial Number: 16401505873524892479 (0xe39ddab16cef233f) + Signature Algorithm: sha1WithRSAEncryption Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=test Validity - Not Before: Oct 27 22:19:32 2016 GMT - Not After : Oct 27 22:19:32 2017 GMT + Not Before: Nov 1 14:18:00 2017 GMT + Not After : Nov 1 14:18:00 2018 GMT Subject: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=* Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (2048 bit) Modulus: - 00:ba:8d:93:2b:b0:77:d2:f2:ef:53:61:1b:f7:22: - 96:b3:db:de:65:26:e7:ca:98:17:ef:8c:34:f8:ce: - b1:64:74:cb:0c:36:9e:f8:7f:c5:46:11:2f:40:83: - ea:00:91:1e:a8:94:ef:80:c7:0d:86:41:4f:d0:8a: - af:de:5a:d9:c8:56:0b:40:b8:b0:68:b5:69:ca:53: - 52:4e:12:a0:a8:d3:0a:e2:66:61:f2:cf:f6:e9:85: - c1:63:94:6e:ff:c6:9b:74:d0:a6:a3:a9:40:f4:6a: - 7a:ce:ae:13:df:dc:54:38:07:88:39:ba:2c:e7:6d: - 81:7c:08:3e:18:3e:bd:08:19:8d:fd:35:40:3d:84: - 33:23:16:d4:2f:10:35:68:07:17:e4:4d:2b:c7:81: - 25:04:fc:cf:e1:10:dc:7d:64:22:0c:79:fc:1e:c3: - 2f:7b:e3:0f:08:54:3a:3d:60:bd:81:2a:ab:df:db: - 32:16:df:ac:4f:ac:85:c4:9e:56:b5:fa:f7:92:b6: - 6a:69:94:09:65:da:6c:e7:a2:d1:2c:ab:1b:d2:45: - 9a:e9:09:fc:c9:c0:9c:50:79:9b:b0:e7:95:66:26: - 56:d1:30:19:3f:01:a3:60:b7:66:13:02:62:df:7b: - c6:98:c9:f4:7c:55:6b:80:87:e0:89:9a:21:70:06: - ec:07 + 00:e4:b7:31:a6:b1:46:57:4b:74:a1:8a:52:a2:10: + be:36:b8:2e:2a:57:b9:52:95:47:6a:8a:8e:df:dc: + a3:c9:a3:d6:63:2e:85:b8:d4:b3:f5:f4:14:77:26: + 5c:2d:7e:ba:16:e0:96:80:8c:26:4c:8a:e0:b1:00: + 95:7d:30:19:78:30:73:35:cd:3b:3b:f5:b6:dd:f4: + 51:37:16:2e:99:96:d0:f8:77:f7:4a:87:0b:76:7e: + e9:02:ac:11:85:d1:13:0d:94:96:6e:2f:85:36:03: + 32:cd:22:b2:b3:9c:b5:78:e7:c8:40:b8:1d:7d:fa: + ab:48:c6:59:a5:79:3d:14:44:d1:b3:7e:11:8a:51: + 6c:04:52:53:eb:8a:0f:bc:c9:8d:d2:fa:54:13:43: + 62:cc:19:85:61:cb:c8:bb:1d:88:ee:d8:36:97:0e: + d0:d7:64:4c:79:f0:1c:52:fa:b9:f4:ff:91:78:8a: + a2:a5:a9:2e:9a:8d:a1:d0:60:6d:9a:f1:04:80:cb: + b6:3e:55:cb:db:26:70:35:3c:ca:ee:70:ff:26:f1: + 54:b8:f2:4b:0c:00:c1:0f:b3:36:75:dd:45:ea:fe: + e1:c7:27:21:fb:0e:1e:57:08:d5:4a:77:dc:85:dc: + b7:97:67:4d:3e:a2:2e:fa:61:63:ad:ee:6b:35:b1: + 1e:ef Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: @@ -38,45 +37,45 @@ Certificate: Netscape Comment: OpenSSL Generated Certificate X509v3 Subject Key Identifier: - 6B:03:14:CD:66:06:85:A7:FB:33:F8:19:D4:B9:37:16:78:01:E6:D5 + 1D:F7:51:09:3A:01:2F:B3:0C:26:E4:43:EE:A6:67:30:B5:30:93:F0 X509v3 Authority Key Identifier: - keyid:6F:8B:50:9F:3F:E8:2B:49:F9:6E:2A:4C:16:3E:12:35:2A:90:33:8C + keyid:74:98:02:FA:11:B6:2A:BD:53:F4:64:92:85:8E:BF:1C:64:86:00:AF - Signature Algorithm: sha256WithRSAEncryption - 3f:44:4e:e1:b5:76:ad:98:f0:a1:f8:1e:e5:37:1d:42:21:7f: - 3a:c7:c6:c4:b1:b5:58:26:74:d5:61:1f:64:c0:e4:d8:c5:af: - ca:5e:a3:e9:d6:15:72:7b:0a:d1:7b:5f:28:61:73:71:22:cc: - 49:dd:03:5c:49:e7:bf:c9:fa:b2:b5:18:d9:39:df:b1:9f:c3: - 6e:10:a4:e1:28:f9:34:b8:89:85:52:40:fb:e4:28:cd:35:e0: - f1:21:cc:7b:7d:68:32:26:4b:b9:ef:60:3f:7f:5e:d9:ca:75: - e6:ef:92:3a:b3:e0:27:c7:f9:12:9b:b7:ed:2e:1d:a5:dc:be: - 05:a3:f0:33:85:8e:41:72:c7:b0:46:94:d9:32:d6:5a:70:f8: - 3c:79:a2:7f:0a:65:a6:69:33:36:e7:1d:4e:c9:52:47:f9:95: - e6:9a:7d:1b:27:ab:f3:75:5f:d5:42:30:e0:1a:c6:b9:76:09: - ae:72:da:34:05:6d:d6:c7:71:ed:d2:ac:ce:41:24:d1:7c:68: - c5:bf:ae:24:66:78:9a:2b:5c:59:95:7f:9e:f0:15:17:d6:eb: - 48:89:f3:e6:ea:d2:f1:ba:54:48:97:d3:dc:36:1e:0a:ed:20: - c0:32:f1:3d:32:32:2c:62:b8:9d:3e:e8:98:54:dd:e2:30:8d: - 49:de:b7:30 + Signature Algorithm: sha1WithRSAEncryption + 55:1a:c2:1c:b9:75:96:27:29:d3:6a:16:29:66:a5:3b:1b:76: + a3:07:55:c6:ef:70:41:85:58:4d:36:61:cb:27:2c:17:cb:3f: + 79:e4:4e:68:1e:02:74:3d:73:84:bf:29:65:67:c7:9a:6a:24: + b1:73:e0:63:ba:cb:50:51:b8:2c:37:80:bc:88:47:c6:9c:5a: + 9c:4c:31:8a:73:b7:2a:6b:be:d2:6f:7b:02:d4:28:e1:c9:e9: + c6:c4:51:7e:a6:5a:cd:dd:23:92:43:f8:40:e5:37:9a:84:32: + 94:70:09:3f:01:5c:b8:11:35:4e:f6:17:fd:c8:27:85:c5:3c: + 6e:35:db:d4:82:04:94:bf:31:6d:ab:f0:8b:bc:62:27:61:36: + 15:ed:9f:5e:20:dd:de:6b:13:a0:93:35:4c:18:12:fc:db:0e: + fb:9f:d0:6e:14:04:e1:ee:e6:8b:e3:bf:08:25:be:25:cb:78: + f5:11:b9:79:6a:ff:0d:82:e3:33:2b:d8:78:6a:1a:a9:51:fb: + 04:8f:87:5e:7b:98:e7:91:27:27:05:41:97:9a:51:7a:72:e8: + e0:81:74:f8:04:2e:d5:48:ac:1a:61:71:ab:32:d7:cd:fc:27: + 4d:0b:44:79:03:84:df:76:5b:a4:c2:9e:ae:25:5d:06:74:30: + a9:60:1a:18 -----BEGIN CERTIFICATE----- -MIIDozCCAougAwIBAgIJAPsxEGKpYeVGMA0GCSqGSIb3DQEBCwUAMFQxCzAJBgNV +MIIDozCCAougAwIBAgIJAOOd2rFs7yM/MA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNV BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX -aWRnaXRzIFB0eSBMdGQxDTALBgNVBAMMBHRlc3QwHhcNMTYxMDI3MjIxOTMyWhcN -MTcxMDI3MjIxOTMyWjBRMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0 +aWRnaXRzIFB0eSBMdGQxDTALBgNVBAMMBHRlc3QwHhcNMTcxMTAxMTQxODAwWhcN +MTgxMTAxMTQxODAwWjBRMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0 ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQowCAYDVQQDDAEq -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuo2TK7B30vLvU2Eb9yKW -s9veZSbnypgX74w0+M6xZHTLDDae+H/FRhEvQIPqAJEeqJTvgMcNhkFP0Iqv3lrZ -yFYLQLiwaLVpylNSThKgqNMK4mZh8s/26YXBY5Ru/8abdNCmo6lA9Gp6zq4T39xU -OAeIObos522BfAg+GD69CBmN/TVAPYQzIxbULxA1aAcX5E0rx4ElBPzP4RDcfWQi -DHn8HsMve+MPCFQ6PWC9gSqr39syFt+sT6yFxJ5Wtfr3krZqaZQJZdps56LRLKsb -0kWa6Qn8ycCcUHmbsOeVZiZW0TAZPwGjYLdmEwJi33vGmMn0fFVrgIfgiZohcAbs -BwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl -bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUawMUzWYGhaf7M/gZ1Lk3FngB -5tUwHwYDVR0jBBgwFoAUb4tQnz/oK0n5bipMFj4SNSqQM4wwDQYJKoZIhvcNAQEL -BQADggEBAD9ETuG1dq2Y8KH4HuU3HUIhfzrHxsSxtVgmdNVhH2TA5NjFr8peo+nW -FXJ7CtF7Xyhhc3EizEndA1xJ57/J+rK1GNk537Gfw24QpOEo+TS4iYVSQPvkKM01 -4PEhzHt9aDImS7nvYD9/XtnKdebvkjqz4CfH+RKbt+0uHaXcvgWj8DOFjkFyx7BG -lNky1lpw+Dx5on8KZaZpMzbnHU7JUkf5leaafRsnq/N1X9VCMOAaxrl2Ca5y2jQF -bdbHce3SrM5BJNF8aMW/riRmeJorXFmVf57wFRfW60iJ8+bq0vG6VEiX09w2Hgrt -IMAy8T0yMixiuJ0+6JhU3eIwjUnetzA= +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5LcxprFGV0t0oYpSohC+ +NrguKle5UpVHaoqO39yjyaPWYy6FuNSz9fQUdyZcLX66FuCWgIwmTIrgsQCVfTAZ +eDBzNc07O/W23fRRNxYumZbQ+Hf3SocLdn7pAqwRhdETDZSWbi+FNgMyzSKys5y1 +eOfIQLgdffqrSMZZpXk9FETRs34RilFsBFJT64oPvMmN0vpUE0NizBmFYcvIux2I +7tg2lw7Q12RMefAcUvq59P+ReIqipakumo2h0GBtmvEEgMu2PlXL2yZwNTzK7nD/ +JvFUuPJLDADBD7M2dd1F6v7hxych+w4eVwjVSnfchdy3l2dNPqIu+mFjre5rNbEe +7wIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl +bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUHfdRCToBL7MMJuRD7qZnMLUw +k/AwHwYDVR0jBBgwFoAUdJgC+hG2Kr1T9GSShY6/HGSGAK8wDQYJKoZIhvcNAQEF +BQADggEBAFUawhy5dZYnKdNqFilmpTsbdqMHVcbvcEGFWE02YcsnLBfLP3nkTmge +AnQ9c4S/KWVnx5pqJLFz4GO6y1BRuCw3gLyIR8acWpxMMYpztyprvtJvewLUKOHJ +6cbEUX6mWs3dI5JD+EDlN5qEMpRwCT8BXLgRNU72F/3IJ4XFPG4129SCBJS/MW2r +8Iu8YidhNhXtn14g3d5rE6CTNUwYEvzbDvuf0G4UBOHu5ovjvwglviXLePURuXlq +/w2C4zMr2HhqGqlR+wSPh157mOeRJycFQZeaUXpy6OCBdPgELtVIrBphcasy1838 +J00LRHkDhN92W6TCnq4lXQZ0MKlgGhg= -----END CERTIFICATE----- diff --git a/test/ssl/peer_private_key.pem b/test/ssl/peer_private_key.pem index 887f05fd2..bdae7f929 100644 --- a/test/ssl/peer_private_key.pem +++ b/test/ssl/peer_private_key.pem @@ -1,30 +1,30 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIf78t+zi0PowCAggA -MBQGCCqGSIb3DQMHBAgL4P4x80PQMQSCBMg4HIQTNUrYz5/Izq8dyynszLytNNnR -VO1yKakwCxnMJWJdvhhDSMWpDXHB466AVFrva+2HgvPGWecURpUxtIp2YiOEyRA8 -YfJH6l6ozzCB88uUltLdRh7Z7SgFbsU2MtbDaWvM66KwyP8wTIVq0ZsA5KmIOq15 -50roEbRE/yHN9FyzbUxfoGSZGADcE9+i2qOEgGoGCeD+0EhXF/Jtz650+wFCYsu2 -WrbpqgWnBS29rMR0W21xBcSixqmzQhzAO5U3QqWY7orTaLqGP/l4dwYerTfcwQEw -W1GLTxHa2OGTdjdRlT2u/dsahbjtu57yeR7ACW0n6JD2lyx2Yx/u4Y458mo2InXS -Mb54CfvGuVOgS+EmhjNe5x0RLH1xr79VlN9iHNs5wYXqSQEFA9KZPkfUlxBh/ddj -blQ4WMMqm01zLt22iZHnbb2T80zQqmz44osBEhhkX64Su0ODFicQIaELuiqY4IA6 -cPs7O/7GPX4J2cQDL+/3NafQrnbFwjKB9gHFU66FMPBnBUIOt1M/xdbu3h/ek86O -qIl1EplKIFX/G/POC08xjl3xFoeMagiQAeVuGVH1N4EXE5DTzgdVmMdH2gLDtVRi -rsz2zla6xdeng4Bkf4yySUAbpRJRuLevQGld1ZLgVzJs3bNbCVqCHAo9Q+2rNLNw -rKQny0RrX/YqG+WJbPP0U8PzAwpReIoBFnxwngoGbuHFijm+UIuIJA3KfzMoxVWN -d/PwVuz+U9wwnJQgLTNqwZbXTa4tREyUBZiePdPt3fA9X+88YgqXIBN/mgKp1X9H -TPPk/bpmwSVR2Su3SxvhI6uMesRMlghrqfi/vi/IDh+/MRi/6PvDlB3ZvZ/kYLjX -9aooLgMOwGtxcVphuzXxfVhBXdJ8wNf1WxixZrSVSijsSJAgpG61qJRc4spWIlHn -IWV0mxVNk4ChUkMjK9h/jdmuJ3C0m8nEl655qSyryyuDS88J9Q6xQ8UfTSR/B3oV -zKHLiuxXqkpDYkozvAeqxapjCqNPcgXb0Z9yPDJP8FCywI9TDaDFoC7RlTgZTJBd -C/CGqGS4qOoWlM6UjzpDY7WC9E1i1Nt/5x9cSpfaIs2sB9VbHnsnSA4Sf/Bo+BYd -DE+wXQ5gJ98mcM9A8nVYLh/P+qfFgABPpREVoGE3yy4QTx48obepqOFLSNwLcunc -9fSlkSjCt9pcZi95+ji1bZOuHghwet4H4GyImiE8U4uk5Wzt575TDEjPrRQeHh5l -U5F8VLWwsU2x6p0mJkfqQCCinnrD/qmPhUOg7DkeZ7DDFjV68A0ky8p4lrT6DBn7 -AlGZRKp1G9jp5micC6aa4WIv7cLsaIQkGr4ggR7/16FmanQ/q7Kcc6XAnUDng+0R -kuwda1dvyvov8CZn+PEJwxtXEfp0J7dzWUqsizYlvXjKFQnHe+QpZhlbK6vqlBeU -sPFFKO4phFpIdL/IRPr6hfIPfmZfzN76mE7bEA3ZL7N5uhCxFmRpLGNdjdkmMqZk -bF5JPFMCTT6Y0ZyU0FZwDMhJ1v53GcrOfn4iI9BK6pSRpCTlJ5nJRVQ+SMTW+/dy -E7ye8nbVwA00ItMnFF7nb5Bd2KoLpInIlu2O844VOwsOjMObyH/7ky0BWGlhdFmG -hx4= +MIIFHzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQI5Noy5Ex7rssCAggA +MB0GCWCGSAFlAwQBKgQQkdHJsEIagXjvW3zAbqcNLwSCBNC2BPAzNj53MS7toQAh +1lUwvkEJYEsip4OcxpZggRkG4VhRIOZpYuS7gGa+2QoFFLI+j1j7NDDRnSS2P41Y +M3JWkmz/qVss8l41ttjMe+AbXXl+R8rwqK8Z/Mg2ZaUGYO38rU8VFO1ihS3gBvfW +HzpQsjceU2PPOt0pee0AypSPaZoQOw2tgzw5U1bPkPnWti40AiCR3u380h2e0yBw +1xyniWHSjL+ZXOOelyOHEi3+q6/SB/lR3IRipnXuIheiUZeEtBrJJcJq+CB+Jxae +yN4Cd/3ezhzvXY3PumyM14tueimJyB2VjRoGPdDmlzicSspyeJkFYSesgBwXSoCa +aWEFJnphFFUrEdFywXcHdsakeVMrP3vBfTWVZ9gC0tWdAMF84bxe1y8/A+PLGkds +z8R2xdilsgi64WQ9dwEsHkbw0SwKWHnKAP80PC7ZFF5nslK03DQ/Nm5KqFdQEFML +ICVMLFIRwBbWmOf/L/WW8jUR9XgNhx0WALevsegeEQd3k6jwSHINmyhKKRTyF4CJ +nFo2S22xZUbdzUjG3UYlVLzIOuRkhfyqQ+C3Ewdce87gbQJjgMEa8ggGP0eUMM7W +64qSKshJum6rIt5KEzFXyMoWVqNiIREj3k4viXzfSK8WNAs0XunwkXpkq2fHck6H +xtV5IkRpFqJNBMi45K5S5yE0aa1URYpQYmTidn9paFUhsU8nHStSysVnVJiRVF5y +HP6gE0Nlh2ZyzTAHoqGVhHxDMB5Uay/NwwAbqBaZLXrizlv4jRsoaAGVCbUwscQA +oEnZx+nxasOTUSDBXw7bre1tzXTnhwv7P55nVA4vEVV1ZnJ3kAtDSN1vT9JVd4R/ +dZRvV+YgeL/8VafMrBe/yiVvZ6YavDzXirB/ZmfyrY+5h09JTP0pKXGLJf6T7u5Q +eDTKob3NOdc42KcLl8u3lhCT2V8L9lHvu0FpK/Bk1NFECfj9sTJtqmbkyD4oKIRH +oXCmTWukhDEO1669nmMWqU6DXFdujPUfEz/6W2FJmW8lSjT1tt2+E9wF/DnSS935 +NYfVagvQTp6rdAV7IE9iWG5ifGeI/Fy3l0IP2lXwfus9TqQmFL96+uKHqIW37kVT +YeV0iLF1tCXYJVjthVHWKprRDJDPTs93+vjEBYwUmFBnDMQE1dmdPRPZpGCz8kqu +Zv8y1sB23sjvhnuFKn9vame7wC89PLt06w+czn/WVmc0ugJBid8Hk4SMUxlCUxfA +aF38OKd63BdcLZCijF2mmzZGrdTuglONb2UpOkVFZ3Lc2MGFmEYnuF42j04lPLDH +LiL1IMO9By0mAXOG+JMiekX1sGX2TgRzCL9pvaXpsVe6II3vBoXS3/nc0jgIbbfb +onBZ2eDEidxa8xWltk4LAxR6XGi96dUjwOqN4k6eW+ZE02QEZ4N7s90DVlHrDpgx +vRyJNju+et+bglFlC8qe4NnrQ7YoW26lfedgXN7fDZR3RSIltdR6KlPYb+fo52UI +muSooXLYNKad5ZiGfWBcehtsPq+5jnLHwIjAwaiDD5LScyAt0c3h7BaO3eZAYXQL +bLNSDRk08nwHu0TRJVEz2KpvFfo0esAU5KwQVICiF3E3HgChloDlFP4gjBhPiSXG +0muhAPEAoKRnrVEo5TqU+VmhxQ== -----END ENCRYPTED PRIVATE KEY----- diff --git a/test/ssl/regenerate_test_certificate.sh b/test/ssl/regenerate_test_certificate.sh index fb6aaf0b2..a7c68177f 100755 --- a/test/ssl/regenerate_test_certificate.sh +++ b/test/ssl/regenerate_test_certificate.sh @@ -2,7 +2,7 @@ set -e -PATH=$PATH:/opt/local/etc/openssl/misc +PATH=$PATH:/usr/local/etc/openssl/misc rm -rf demoCA @@ -27,3 +27,5 @@ cp newcert.pem peer_certificate.pem openssl dhparam -outform PEM -out dhparams.pem 2048 +printf "\n\nSUCCESS!\n" + diff --git a/test/ssl/root_ca_cert.pem b/test/ssl/root_ca_cert.pem index 9a7ef9329..7a94cef9e 100644 --- a/test/ssl/root_ca_cert.pem +++ b/test/ssl/root_ca_cert.pem @@ -1,79 +1,78 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: - fb:31:10:62:a9:61:e5:45 - Signature Algorithm: sha256WithRSAEncryption + Serial Number: 16401505873524892478 (0xe39ddab16cef233e) + Signature Algorithm: sha1WithRSAEncryption Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=test Validity - Not Before: Oct 27 22:18:33 2016 GMT - Not After : Oct 27 22:18:33 2019 GMT + Not Before: Nov 1 14:17:41 2017 GMT + Not After : Oct 31 14:17:41 2020 GMT Subject: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=test Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (2048 bit) Modulus: - 00:cd:4a:c7:e0:6a:f6:92:7b:0d:dd:7f:81:4e:95: - 0b:73:2c:5a:f2:36:d0:49:b9:05:6b:36:18:6c:cd: - 99:c6:e8:ce:5e:e3:53:18:21:82:fe:1a:dd:dd:13: - 58:63:0d:45:06:b6:4d:80:4b:ff:f0:45:9d:d7:51: - a7:2b:34:96:b5:2b:32:5c:f7:7e:83:1c:4b:ec:88: - 8e:a3:c7:98:77:87:80:83:42:b6:55:ee:f4:ec:b9: - 76:0b:2f:70:e8:67:2a:ee:19:a6:21:42:8e:98:00: - 29:67:f1:7b:99:b8:9b:98:8b:19:4f:9e:45:0f:e9: - 59:9c:6f:d1:d9:cf:d2:9c:ef:43:5b:72:db:5f:36: - 44:fb:be:b6:f7:e6:35:12:79:c4:79:8e:71:fb:46: - 1a:79:a8:9e:ee:2f:cd:c6:24:31:c8:1f:6f:99:fa: - fb:9a:c8:0d:6c:5b:58:b2:b9:ab:03:3e:74:72:56: - 6c:81:08:67:2c:da:c9:dc:16:59:cc:b0:a1:fa:ea: - 53:42:93:61:25:91:1b:4c:0c:c6:96:57:be:01:65: - 35:95:fd:e6:65:a1:2d:da:ba:f3:0a:d9:5c:5d:a3: - 05:9e:d1:bd:41:1b:fe:4e:99:85:10:17:e4:14:68: - 3d:90:27:06:c8:71:3a:b9:8e:40:06:5a:cd:56:38: - 6e:4d + 00:c4:73:fa:40:3b:53:9f:86:ce:98:96:01:cd:10: + 2d:82:bb:9e:94:f8:76:7d:cf:f5:32:c5:77:08:72: + 35:89:ca:6b:e4:b0:13:50:98:25:78:ba:f0:f8:30: + 3e:8f:04:3f:fa:9e:68:ec:4f:ab:63:04:4a:0d:1d: + 54:c0:82:03:de:ec:7d:cf:f8:ef:23:82:61:09:26: + 13:cf:6d:9b:a5:2b:e2:2e:34:f7:2b:5c:56:1b:20: + e5:bb:23:fc:10:7a:27:0b:a3:0b:59:90:2d:a5:19: + e5:05:2e:39:78:49:34:19:91:d0:3e:23:9c:32:5c: + 5f:a8:29:fd:2d:38:b7:ee:a7:e3:c2:5e:6d:d4:e3: + 07:b9:39:f1:00:f2:57:b8:38:d1:e6:d8:10:28:22: + df:3f:8d:af:85:26:b5:ce:c8:d3:5e:7a:d7:46:5e: + 19:a2:f7:17:44:21:d3:91:f8:46:26:b7:1d:55:e6: + e6:8a:6e:86:aa:1e:56:75:22:df:9b:43:65:42:3b: + 5a:96:0f:f8:54:55:19:00:b5:57:04:25:c5:4b:cf: + db:8b:e6:52:3e:59:a6:ae:43:52:9a:70:d5:f8:2d: + 5a:43:07:c6:ee:39:4b:46:0b:0e:45:a5:b7:dd:69: + e8:2e:71:9f:05:7c:6a:1d:85:8f:a5:f6:aa:a2:cb: + 65:c3 Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Subject Key Identifier: - 6F:8B:50:9F:3F:E8:2B:49:F9:6E:2A:4C:16:3E:12:35:2A:90:33:8C + 74:98:02:FA:11:B6:2A:BD:53:F4:64:92:85:8E:BF:1C:64:86:00:AF X509v3 Authority Key Identifier: - keyid:6F:8B:50:9F:3F:E8:2B:49:F9:6E:2A:4C:16:3E:12:35:2A:90:33:8C + keyid:74:98:02:FA:11:B6:2A:BD:53:F4:64:92:85:8E:BF:1C:64:86:00:AF X509v3 Basic Constraints: CA:TRUE - Signature Algorithm: sha256WithRSAEncryption - a8:ae:26:90:38:b2:d5:e0:4a:f5:d4:ee:f4:cc:fa:02:f7:df: - 87:1f:62:1d:06:3a:e6:58:dc:47:6a:f9:f9:d3:aa:0b:4c:1b: - 2f:30:08:27:31:73:90:d7:4b:3d:31:c8:28:4a:30:7b:8f:59: - f6:ec:03:fb:7c:9b:39:01:4b:91:38:58:89:64:d9:a1:de:50: - ac:0c:70:04:23:57:9b:6d:83:30:8a:eb:2e:3e:8a:34:45:3a: - f1:19:b6:0d:66:cd:d7:3b:49:04:6d:a2:6d:4c:6e:30:1e:38: - f6:4f:8e:5c:05:48:83:02:3e:27:ce:8a:60:2a:36:45:db:e2: - 68:3d:33:3d:9c:ac:11:04:2e:e4:1e:97:9d:13:62:65:13:fd: - 3d:29:62:96:01:d4:d2:8d:ab:43:82:08:93:1a:bc:b7:9a:41: - ae:92:63:39:78:18:c6:6e:0d:41:a5:cf:30:98:c6:30:d4:73: - 09:6b:c0:7b:42:ee:05:5a:2a:99:4e:09:7a:89:da:2e:40:1c: - 1e:09:f3:b6:e4:8d:c1:06:6d:27:a0:85:63:f0:d5:30:c3:20: - f2:5b:8b:4f:13:ba:f8:05:2f:fe:b8:f4:0b:75:34:02:1d:2f: - a8:e8:e8:62:da:d4:fe:f1:d4:6d:9d:63:4a:92:d8:08:20:2a: - 92:82:f1:86 + Signature Algorithm: sha1WithRSAEncryption + 7c:41:90:e9:74:9a:ba:32:da:27:27:1d:fc:49:56:30:70:f1: + 96:14:46:a6:a7:b6:0f:0a:04:9e:d5:0f:3a:4d:c0:14:33:92: + 5f:db:d6:26:e8:8f:97:0b:50:16:c1:2d:c5:8a:79:99:b6:52: + 41:98:8a:10:9f:39:38:50:1f:10:c5:cc:5e:4f:90:43:a3:8e: + 74:71:9d:2d:f6:3f:d7:88:f4:fb:1a:01:3e:aa:ea:e5:52:c1: + 23:d1:e9:3b:1c:17:4c:62:ff:72:27:8c:eb:a1:c5:ba:1d:eb: + 96:c0:4a:b3:dd:6b:67:d0:6f:37:1c:11:a8:aa:25:5e:af:87: + 9e:c2:29:6c:83:5d:13:a0:1c:46:8c:0a:83:f6:cc:02:3c:d4: + d3:ca:3c:11:8f:96:26:56:19:57:4f:0a:98:5c:4a:b8:10:b7: + a5:7f:2c:38:e0:f3:d4:68:31:de:53:47:36:21:f1:86:6d:8d: + 07:d2:cf:58:a8:96:a3:03:52:1b:fb:24:0b:17:28:da:20:06: + 4f:ca:52:76:23:f3:81:c6:e9:32:08:bc:f3:05:ce:1c:5d:f1: + c9:80:7c:68:f0:f6:eb:4c:8f:b6:30:88:53:5c:01:92:f4:64: + 4c:9b:0a:13:ab:1e:7f:82:6a:f1:92:e0:84:66:2e:87:fb:f9: + 6d:a9:cf:a0 -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/test/ssl/root_ca_private.pem b/test/ssl/root_ca_private.pem index c021aa028..eb95ee9e5 100644 --- a/test/ssl/root_ca_private.pem +++ b/test/ssl/root_ca_private.pem @@ -1,30 +1,30 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI1EUlICsEbfUCAggA -MBQGCCqGSIb3DQMHBAhnNizmXkJLrASCBMgdOxbSBPCYBDR5VUI3+wWUkEwgYut9 -48HpzieETiBo9Gks4qFlbmXhFVSMRlLiilPzLAgoK3SAhqIIck+6icpVRe8I3rjw -6xXyBDe/nz+KmG/Zr+AMCG1lgfLYh4Cl+SIxD8y1bcDoO6P3HqMeBmwA7ZxIgRhI -jWKPPs2GM/EhNqMlZKrVfF/wJZx9j1pjd18S+yn0FhD9hYG+qsZ1w++xFIv2CUqr -PNGCQzGI3B0EE+BADLxFgJxWA970114xpzxYeUTGSDfeXs8zw3l4qa+Ol7yHcJvG -FFJ0mtWGCAeX+uUSMEMoErJM3WlZzg1IKPG/K3fa0GFSVzSbSvM1YQzpWq4djMN7 -L6dkUMbXw32+FF9CdoHJ6MjJD/Szi9aegezZVjhGM1ZvUpPwggyHJbw0TCLq2uOw -W27fPNJ619WLS2XXiCsapLnF6uVAbbPmBim1pUQikpEBlOD9sLSTQVxKITkoHyl2 -qjm6clAg1NwHR8qRmEFUXv29htE/0FYVI5686484zTifNY7dfuPklBw+PEf0q58t -OZXb/e/lKGq4Mk/ikezkcjfh9bjZjESj3jCEKMUb4mCnMaxazYVpQ1nNCm64ZNDp -vtCU1v6DcvvfVDU+Hb6qNbJmWMuzn8hqShYJH5DcT/vD4WtV6WntYHFR5tgaLvzE -k21ZT3L9VssDONqC9I464FdbWC3sis/kfpJqZrjvAB/tmIE9dZ9GQv/3nHaSsHzy -tkvd1IOOK0o6yIoUw38LLfv2EUbXJZwgPUF+FL3jLYIMu86R3dkJQZpwl9BHuwhf -CJERfjtfKQ9TbrzwN1f+QHRehYKhxGLcMdzYsYHHNCSvcJ7SCigWCD9yM2cwEjP0 -8MJmKoeAvPPz7xTHXjlRb0oY6qnECKTq5NhVlUfWdfzPfJzQhk6RLVGHLcnJH8eZ -u7I6PN6Am05OWTsdpHQQ/KzGA3sBpRl1bpm24nRqcV7tYmt7u1mtT3YE1NxOFICK -/7W/MryeNEZeWOJ8SFXeg7hbx8/62aKNlnh630bmshmWm+2rnoAfqWRTcq4Bvigg -PNNYwAMXMxC2DaUgN3dyi+s/Y7tD2WkUeTtgZqk1b7Kamd5YXGGBpPyiC3qRW5uG -cjihaLumUmisDFDMOx6H5z7loT1tYTb9Z+XDRX8BhcqR4+4IKFbyxFAYxGGnqjaU -lLkCMMeY7Bf0El0cjsi8BFoqL7BSmZZyb6zFZUPXaZ5aLm/Y/josixOcxHq3giqs -mNAizkpn/eA/ce57Ud8Yp8Cm9kdZPjDT1GcAikr5bgMbVrStkpVcLifAWcC3oTvK -pYaEB76RqbzXffVQRaMyj5WEPsVAP7mGc7DNDs9sE7AnuJc9NJv0jfewhBuA6puz -VXuD2fa14aJVaXrHlbwJkSCpph2Ea+JsdseR2i7nfb4lK+g8sRZnKUzdlbHDXZfV -/AJC0Ae8SrCNMQjsljPisBu1wPt8u6q6Hio/BKzeBWwHQbab343lG8MFN++DYJXk -xwbq1Z8kUgH85+SoaCTkciYJSAbQGUx8mAGIe8DJFokGqOmEnlNI7/Qa1d0vn79H -zJVkVutRKU5WRmsLIGzd1et5DmiN95/ga/XqOpwaPENgUqVK2NEAyq8JES75JESm -njk= +MIIFHzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQIIfu7jg47z0YCAggA +MB0GCWCGSAFlAwQBKgQQcS1zoA9/tSFIzvwDdNBAGQSCBNCCCGl48T+mAuF10Io2 +496dwfjaNuhHy7hUqqR87NR39ROJau2hcqNaRH2zUhAoLm87RpLLK7en26M0/pqe +wgmyX8zw+jpjNPJ153NpGWqMSWFPtKjWqp4jxpLtaGHaucoOVIraj1SKXxG580SA +/yaUvOFtOostdte19edYEhRm/5q+JZTz1CaoulDxcQjqdSgUOZey+yxgT/Nh4WJB +fKtSni4k76NyXPAS+aE8gzZ+7N8x0W5fxzKJmmCznyTx/wWtW084ajBccfXzJuY1 +H2hoGmlkZSJeiMtGP9FBt0YJnNr+Qi9XuGb7MUv3yCbYA2pD4ohSeOsVn4yR1hyX +e4sern5gVQBDzYZmzq2YVHmCvrLtiKzLoAKCfoXJl3mzE9b2lnv08GE0TOJACEQ2 +vVFn/qk9rUm7g36mIRHNMWekzy4ogxYyn9PBtz6mIZ+Uf9pF9laHxWrvhUlFMERk +BFLE6hTHqBw2pQXjCuMJuu5mLlGlqfz15nm/UQ5GnYJp00s5/D5xE8qsCN+arj+u +rleqhK8IGSGq2mE7Q6aX5mCfzR26qnQDQG3nvPYCLV5dDxr3LMSSEtbDOVSkNLre +Hsne1f6Z7j59Bp7Wno0lg+0gz8IjfzSD4t6tHqFuCBcFwtiFFnqrDGwuz1zBjEFP +w4T/Xx+JbbkNzwZsGwY+vd/PG3bByvZajTo9DLv53YSP4ohNprH1rEbxAm81BPnk +/P35oqd6eH3iQgM6A9sF2JD3cs175vRrnKJmomX3zShkf/rsmXcOwUcFrLKxPIZv +2ViHyshiJMInjQwlFc5aEyV+4NzJVZimcC684xfFOV2jru3pepnw9jqT4kROTAul +hKNZHxz/5W67d5sEFAOze9GMC9iVgZLJkc6bf3izEL+miee6RSb5krNSyOvLWe34 +Gba7bBc+B5kbWi+/4xfQl+fMbGfQbdhqKLiveXez4bZYwL4qfc8h0NbFqQky4621 +q8apa0SDNCh+q1PI4692sTVOpRCIfffkodw3RKosAnbs3DCt053vjPJ+pjNXHvBQ +oPSJ6xWnLf0HlLhZQ/+NspJ1v0ADn7dvkDkCvdIsGqgQkk4SpdDrEDH48bN6RF+I +nV8LXqZ3j4xjWQLgoFkoKOqhL8bBEYZr6IHAaIVL8hF0cpCP3FP2hKcek0Qx28gk +Sqh3ooOvcic0iLYjvGi/4ORDHnJuOL+P+Gr4O8sqsM4ywYo7q6JoB2cpp9pDWyU0 +Z0QSOVQWNZ4FLmBvrYDlIpCPEMQw/whY4M+kQScQrJFiykKrW0fitqaK1z6B4Xu7 +vFVjOsoGBLdzhJbo1+BbZZJbPTq+bdeODFL18QHmxMH5p1qPg4HsGnNrak5+0Cct +q2IYV8uDE7JgWgEEbDyFq0GLJFZVu2oQd2nAOGO6lIO/RRItXSHkVpd1QKiutQgH +lMHaJga379VQ482JWLhFtqKcTmnfW542LNOKNqXNhd6HxgdydNCC+eLZKMcHELdZ +9B4UJlhHvDbuvRTOEmvMJpOPFc+e5JayQgo1kwwxG3I9uOkkIxmiT+Wp3n6Bz4Re +sE1F6MDHM2F9adVHAuzHa6GUQNn7YhVk1gzJKts7XCeNsNWKmoq57xXAnDYYqBpX +sXSlz2kQ3PO+R5dVqPwro2us3g== -----END ENCRYPTED PRIVATE KEY-----