porting rev.1912 from 1.4.4 (fixed SF# 3552597)

aleks-f · aleks-f · commit 662050937e7e · 2012-08-18T02:19:34.000Z
diff --git a/Crypto/src/CipherImpl.cpp b/Crypto/src/CipherImpl.cpp
@@ -116,7 +116,7 @@ namespace
 			&_ctx,
 			_pCipher,
 			&_key[0],
-			&_iv[0],
+			_iv.empty() ? 0 : &_iv[0],
 			(dir == DIR_ENCRYPT) ? 1 : 0);
 	}
 
diff --git a/Crypto/testsuite/src/CryptoTest.cpp b/Crypto/testsuite/src/CryptoTest.cpp
@@ -145,6 +145,36 @@ void CryptoTest::testEncryptDecryptWithSalt()
 }
 
 
+void CryptoTest::testEncryptDecryptDESECB()
+{
+	Cipher::Ptr pCipher = CipherFactory::defaultFactory().createCipher(CipherKey("des-ecb", "password"));
+
+	for (std::size_t n = 1; n < MAX_DATA_SIZE; n++)
+	{
+		std::string in(n, 'x');
+		std::string out = pCipher->encryptString(in, Cipher::ENC_NONE);
+		std::string result = pCipher->decryptString(out, Cipher::ENC_NONE);
+		poco_assert (in == result);
+	}
+
+	for (std::size_t n = 1; n < MAX_DATA_SIZE; n++)
+	{
+		std::string in(n, 'x');
+		std::string out = pCipher->encryptString(in, Cipher::ENC_BASE64);
+		std::string result = pCipher->decryptString(out, Cipher::ENC_BASE64);
+		poco_assert (in == result);
+	}
+
+	for (std::size_t n = 1; n < MAX_DATA_SIZE; n++)
+	{
+		std::string in(n, 'x');
+		std::string out = pCipher->encryptString(in, Cipher::ENC_BINHEX);
+		std::string result = pCipher->decryptString(out, Cipher::ENC_BINHEX);
+		poco_assert (in == result);
+	}
+}
+
+
 void CryptoTest::testStreams()
 {
 	Cipher::Ptr pCipher = CipherFactory::defaultFactory().createCipher(CipherKey("aes256"));
@@ -218,6 +248,7 @@ CppUnit::Test* CryptoTest::suite()
 
 	CppUnit_addTest(pSuite, CryptoTest, testEncryptDecrypt);
 	CppUnit_addTest(pSuite, CryptoTest, testEncryptDecryptWithSalt);
+	CppUnit_addTest(pSuite, CryptoTest, testEncryptDecryptDESECB);
 	CppUnit_addTest(pSuite, CryptoTest, testStreams);
 	CppUnit_addTest(pSuite, CryptoTest, testCertificate);
 
diff --git a/Crypto/testsuite/src/CryptoTest.h b/Crypto/testsuite/src/CryptoTest.h
@@ -53,6 +53,7 @@ class CryptoTest: public CppUnit::TestCase
 
 	void testEncryptDecrypt();
 	void testEncryptDecryptWithSalt();
+	void testEncryptDecryptDESECB();
 	void testStreams();
 	void testCertificate();
 	
diff --git a/Foundation/include/Poco/FileChannel.h b/Foundation/include/Poco/FileChannel.h
@@ -155,7 +155,7 @@ class Foundation_API FileChannel: public Channel
 	/// The purgeAge property can have the following values:
 	///
 	///   * "none" or ""   no purging
-	///   * <n> [seconds]  the maximum age is <n> seconds.
+	///   * <n> [seconds]: the maximum age is <n> seconds.
 	///   * <n> minutes:   the maximum age is <n> minutes.
 	///   * <n> hours:     the maximum age is <n> hours.
 	///   * <n> days:      the maximum age is <n> days.
diff --git a/NetSSL_OpenSSL/src/SecureSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureSocketImpl.cpp
@@ -241,6 +241,7 @@ void SecureSocketImpl::shutdown()
 			// done with it.
 			int rc = SSL_shutdown(_pSSL);
 			if (rc < 0) handleError(rc);
+			if (_pSocket->getBlocking()) _pSocket->shutdown();
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ namespace`
`116`	`116`	`&_ctx,`
`117`	`117`	`_pCipher,`
`118`	`118`	`&_key[0],`
`119`		`- &_iv[0],`
	`119`	`+ _iv.empty() ? 0 : &_iv[0],`
`120`	`120`	`(dir == DIR_ENCRYPT) ? 1 : 0);`
`121`	`121`	`}`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,7 @@ void SecureSocketImpl::shutdown()`
`241`	`241`	`// done with it.`
`242`	`242`	`int rc = SSL_shutdown(_pSSL);`
`243`	`243`	`if (rc < 0) handleError(rc);`
	`244`	`+ if (_pSocket->getBlocking()) _pSocket->shutdown();`
`244`	`245`	`}`
`245`	`246`	`}`
`246`	`247`	`}`