Update POCO to 1.11.0

vendor/POCO/NetSSL_OpenSSL/testsuite/any.pem

@@ -1,54 +1,49 @@
 -----BEGIN CERTIFICATE-----
-MIIEFjCCAv6gAwIBAgIBAjALBgkqhkiG9w0BAQUwgdMxEzARBgNVBAMMCmFwcGlu
-Zi5jb20xNjA0BgNVBAoMLUFwcGxpZWQgSW5mb3JtYXRpY3MgU29mdHdhcmUgRW5n
-aW5lZXJpbmcgR21iSDEUMBIGA1UECwwLRGV2ZWxvcG1lbnQxEjAQBgNVBAgMCUNh
-cmludGhpYTELMAkGA1UEBgwCQVQxHjAcBgNVBAcMFVN0LiBKYWtvYiBpbSBSb3Nl
-bnRhbDEtMCsGCSqGSIb3DQEJAQweZ3VlbnRlci5vYmlsdHNjaG5pZ0BhcHBpbmYu
-Y29tMB4XDTA5MDIyMzEzNDIwMloXDTExMTEyMDEzNDIwMlowgcoxCjAIBgNVBAMM
-ASoxNjA0BgNVBAoMLUFwcGxpZWQgSW5mb3JtYXRpY3MgU29mdHdhcmUgRW5naW5l
-ZXJpbmcgR21iSDEUMBIGA1UECwwLRGV2ZWxvcG1lbnQxEjAQBgNVBAgMCUNhcmlu
-dGhpYTELMAkGA1UEBgwCQVQxHjAcBgNVBAcMFVN0LiBKYWtvYiBpbSBSb3NlbnRh
-bDEtMCsGCSqGSIb3DQEJAQweZ3VlbnRlci5vYmlsdHNjaG5pZ0BhcHBpbmYuY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxjGFE96wa83Kdiv0m10O
-XmBmZ5xuclalVTCisLzUmAekbItMjkmI6dVw9r5gd0W5zDWrgPYUmYgtvqnxSHRK
-PRAN410Yq9vqWYvQscpnXGlqUag8t+OBXJhiFnnea/btA0zGVZk6RE/7cWK8AtKH
-Q/Xds3AUJ1L/1uV/e/5azyUDyptsmHbCMUwWhGBrj/KZEviHmRMN/xJLrbIBPkla
-4HRB61rI8in0jziCwThJ7KiQumzWRu2IJjS+VoNWvG52dYLDvfxppuY1rlF0SG/h
-JuSJQqJjZZ11V4TePHscFkGU2tnHqF4UhSjLFJWsGuxnAmZTeIRmavmIIMm3/G6C
-WwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAc+mn/ZEaK59B/UAgx8cMlGM9UigJv
-L9O46pno3YirBq9SrMzf5b6rrbJm8tkQNfldqaVNA5oVbfxnAHhCUDkX8m0x/De8
-teo9nFei8kETQ25ykV+WLapOdrYxakHPtNVgDTGWNb2GY/hH3nMvtdgFvaS80ncD
-tOa13tE4jopFQFY56VKq+sv4Hm5JDvr+dD/g77Cio02sUzSH96FrFIG5/kw1NihB
-IJKZ4n7atQizDe4TiR/NRonmZNbsB+18yTKT8traCS30JGKQqYxXuVKPyQd7FARv
-ajZxRPbcpAtvWBKXpRHXo4xIBJaPktVOG2hGovjRixXYb83hQ87t1Ozy
+MIIDojCCAooCCQD768hnUSguIzANBgkqhkiG9w0BAQUFADCBkjELMAkGA1UEBhMC
+QVQxEjAQBgNVBAgMCUNhcmludGhpYTEeMBwGA1UEBwwVU3QuIEpha29iIGltIFJv
+c2VudGFsMTYwNAYDVQQKDC1BcHBsaWVkIEluZm9ybWF0aWNzIFNvZnR3YXJlIEVu
+Z2luZWVyaW5nIEdtYkgxFzAVBgNVBAMMDnd3dy5hcHBpbmYuY29tMB4XDTIxMDYx
+NjE1NDEwMFoXDTQxMDYxMTE1NDEwMFowgZIxCzAJBgNVBAYTAkFUMRIwEAYDVQQI
+DAlDYXJpbnRoaWExHjAcBgNVBAcMFVN0LiBKYWtvYiBpbSBSb3NlbnRhbDE2MDQG
+A1UECgwtQXBwbGllZCBJbmZvcm1hdGljcyBTb2Z0d2FyZSBFbmdpbmVlcmluZyBH
+bWJIMRcwFQYDVQQDDA53d3cuYXBwaW5mLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMI1emXmsjDX+m3vh6QOYrtcW5YWKzVhfDoAltl7Cl12O5rh
+FfdcVvmHHmgHot/xkb2sPTTDFtm7DzA/igzjdhDJ0qTwoEpBZR/7OtjgF9uZQc8w
+e4ahADHseUpJGolbsMyE6/wbFG3bekxjIbork10ECLWNwhrNBejOWxVjKhKVXREu
+3KFglhtI0MnCfbV8EC/IT+1Ep6+GT5NrEougIre8N3Ts/fuvHuQqIVzW2DGOEpm7
+qkJ3BIhJpXRkN/MFuGgqZjCghbHoBRxXDU211GDA6g06WpF4eTMhzwEYHotZ1Jyb
+AV/HG7eHlt0chU1Lqql/4okd2rZJWClRzuZaikkCAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEALwC4hmaldmpbTa+NKmgD9AherFW4IKZsBBTbTxTBzK6UsgKkGiTZ+2Z0
+95hCv1WhgHrvQ6qjH2D9eGC9VL0VPEALm1YSDJQWMK2fVsuaTeOJ/BCVzv4f42sT
+AXPsEIT32RTscvCvf9F5wAOW5vLrWW4kYbeBOK0gN1GnCJVLivMFkYHeEgH/08wN
+OenXNYX21BqJxbsAXXvLpuCFGmCJlHA1Jach041frllWi17ECor++u64Fvd12OHM
+Lgiztyr3GEqHogpeQ87iWq6uNC+u3bmQUeJgsx911iw8h55LKuKjPAoboGb8rYY+
+7trsTkkW+vkQDr89huGV21dviCDKvA==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,0950752701CB74AF
-
-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
+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
 -----END RSA PRIVATE KEY-----

vendor/POCO/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp

@@ -371,7 +371,6 @@ void HTTPSClientSessionTest::testCachedSession()
 	HTTPSClientSession s2("127.0.0.1", srv.port(), pClientContext, pSession1);
 	HTTPRequest request2(HTTPRequest::HTTP_GET, "/small");
 	s2.sendRequest(request2);
-	Session::Ptr pSession2 = s2.sslSession();
 	HTTPResponse response2;
 	std::istream& rs2 = s2.receiveResponse(response2);
 	assertTrue (response2.getContentLength() == HTTPSTestServer::SMALL_BODY.length());
@@ -380,11 +379,8 @@ void HTTPSClientSessionTest::testCachedSession()
 	StreamCopier::copyStream(rs2, ostr2);
 	assertTrue (ostr2.str() == HTTPSTestServer::SMALL_BODY);
 
-	assertTrue (pSession1 == pSession2);
-
 	HTTPRequest request3(HTTPRequest::HTTP_GET, "/small");
 	s2.sendRequest(request3);
-	Session::Ptr pSession3 = s2.sslSession();
 	HTTPResponse response3;
 	std::istream& rs3 = s2.receiveResponse(response3);
 	assertTrue (response3.getContentLength() == HTTPSTestServer::SMALL_BODY.length());
@@ -393,14 +389,11 @@ void HTTPSClientSessionTest::testCachedSession()
 	StreamCopier::copyStream(rs3, ostr3);
 	assertTrue (ostr3.str() == HTTPSTestServer::SMALL_BODY);
 
-	assertTrue (pSession1 == pSession3);
-
 	Thread::sleep(15000); // wait for session to expire
 	pServerContext->flushSessionCache();
 
 	HTTPRequest request4(HTTPRequest::HTTP_GET, "/small");
 	s2.sendRequest(request4);
-	Session::Ptr pSession4 = s2.sslSession();
 	HTTPResponse response4;
 	std::istream& rs4 = s2.receiveResponse(response4);
 	assertTrue (response4.getContentLength() == HTTPSTestServer::SMALL_BODY.length());
@@ -408,8 +401,6 @@ void HTTPSClientSessionTest::testCachedSession()
 	std::ostringstream ostr4;
 	StreamCopier::copyStream(rs4, ostr4);
 	assertTrue (ostr4.str() == HTTPSTestServer::SMALL_BODY);
-
-	assertTrue (pSession1 != pSession4);
 }
 
 

vendor/POCO/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp

@@ -18,6 +18,8 @@
 #include "Poco/Net/SecureStreamSocket.h"
 #include "Poco/Net/SecureServerSocket.h"
 #include "Poco/Net/Context.h"
+#include "Poco/Net/RejectCertificateHandler.h"
+#include "Poco/Net/AcceptCertificateHandler.h"
 #include "Poco/Net/Session.h"
 #include "Poco/Net/SSLManager.h"
 #include "Poco/Util/Application.h"
@@ -70,6 +72,26 @@ namespace
 			}
 		}
 	};
+
+	class NullConnection: public TCPServerConnection
+	{
+	public:
+		NullConnection(const StreamSocket& s): TCPServerConnection(s)
+		{
+		}
+
+		void run()
+		{
+			SecureStreamSocket ss = socket();
+			try
+			{
+				ss.completeHandshake();
+			}
+			catch (...)
+			{
+			}
+		}
+	};
 }
 
 
@@ -381,6 +403,50 @@ void TCPServerTest::testReuseSession()
 }
 
 
+void TCPServerTest::testContextInvalidCertificateHandler()
+{
+	SecureServerSocket svs(0);
+	TCPServer srv(new TCPServerConnectionFactoryImpl<NullConnection>(), svs);
+	srv.start();
+
+	Context::Ptr pClientContext = new Context(
+		Context::CLIENT_USE,
+		"",
+		"",
+		"",
+		Context::VERIFY_RELAXED,
+		9,
+		true,
+		"ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
+
+	pClientContext->setInvalidCertificateHandler(new Poco::Net::RejectCertificateHandler(false));
+
+	SocketAddress sa("127.0.0.1", svs.address().port());
+
+	try
+	{
+		SecureStreamSocket ss1(sa, pClientContext);
+		fail("must throw with RejectCertificateHandler");
+	}
+	catch (...)
+	{
+	}
+
+	pClientContext->setInvalidCertificateHandler(new Poco::Net::AcceptCertificateHandler(false));
+
+	try
+	{
+		SecureStreamSocket ss1(sa, pClientContext);
+	}
+	catch (...)
+	{
+		fail("must not throw with AcceptCertificateHandler");
+	}
+
+	srv.stop();
+}
+
+
 void TCPServerTest::setUp()
 {
 }
@@ -400,6 +466,7 @@ CppUnit::Test* TCPServerTest::suite()
 	CppUnit_addTest(pSuite, TCPServerTest, testMultiConnections);
 	CppUnit_addTest(pSuite, TCPServerTest, testReuseSocket);
 	CppUnit_addTest(pSuite, TCPServerTest, testReuseSession);
+	CppUnit_addTest(pSuite, TCPServerTest, testContextInvalidCertificateHandler);
 
 	return pSuite;
 }

vendor/POCO/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h

@@ -29,6 +29,7 @@ public:
 	void testMultiConnections();
 	void testReuseSocket();
 	void testReuseSession();
+	void testContextInvalidCertificateHandler();
 
 	void setUp();
 	void tearDown();