diff -r 37d545eabfea -r 8f1801a322e9 usr/src/lib/openssl/Patches/25-6881996.patch --- a/usr/src/lib/openssl/Patches/25-6881996.patch Sun Dec 20 07:09:18 2009 +0200 +++ b/usr/src/lib/openssl/Patches/25-6881996.patch Sun Dec 20 07:12:51 2009 +0200 @@ -1,6 +1,6 @@ diff -ruN ../a/openssl-0.9.8k/CHANGES openssl-0.9.8k/CHANGES ---- ../a/openssl-0.9.8k/CHANGES 2009-03-25 03:46:55.000000000 -0700 -+++ openssl-0.9.8k/CHANGES 2009-10-05 14:58:27.131290179 -0700 +--- ../a/openssl-0.9.8k/CHANGES 2009-03-25 11:46:55.000000000 +0100 ++++ openssl-0.9.8k/CHANGES 2009-10-14 17:14:10.064846541 +0200 @@ -2,6 +2,13 @@ OpenSSL CHANGES _______________ @@ -16,8 +16,8 @@ *) Don't set val to NULL when freeing up structures, it is freed up by diff -ruN ../a/openssl-0.9.8k/crypto/evp/c_alld.c openssl-0.9.8k/crypto/evp/c_alld.c ---- ../a/openssl-0.9.8k/crypto/evp/c_alld.c 2005-04-30 14:51:40.000000000 -0700 -+++ openssl-0.9.8k/crypto/evp/c_alld.c 2009-10-05 14:58:27.139011742 -0700 +--- ../a/openssl-0.9.8k/crypto/evp/c_alld.c 2005-04-30 23:51:40.000000000 +0200 ++++ openssl-0.9.8k/crypto/evp/c_alld.c 2009-10-14 17:14:10.065117156 +0200 @@ -64,9 +64,6 @@ void OpenSSL_add_all_digests(void) @@ -29,9 +29,17 @@ EVP_add_digest(EVP_md4()); #endif diff -ruN ../a/openssl-0.9.8k/crypto/opensslv.h openssl-0.9.8k/crypto/opensslv.h ---- ../a/openssl-0.9.8k/crypto/opensslv.h 2009-10-05 15:32:36.329125471 -0700 -+++ openssl-0.9.8k/crypto/opensslv.h 2009-10-05 15:34:36.847601425 -0700 -@@ -34,6 +34,7 @@ +--- ../a/openssl-0.9.8k/crypto/opensslv.h 2009-10-14 17:13:51.667902897 +0200 ++++ openssl-0.9.8k/crypto/opensslv.h 2009-10-14 17:14:28.797866461 +0200 +@@ -32,6 +32,7 @@ + " CVE-2009-1377" \ + " CVE-2009-1378" \ + " CVE-2009-1379" \ ++ " CVE-2009-2409" \ + ")" + #else + #define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8k 25 Mar 2009 " \ +@@ -39,6 +40,7 @@ " CVE-2009-1377" \ " CVE-2009-1378" \ " CVE-2009-1379" \ @@ -40,8 +48,8 @@ #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff -ruN ../a/openssl-0.9.8k/crypto/x509/x509_vfy.c openssl-0.9.8k/crypto/x509/x509_vfy.c ---- ../a/openssl-0.9.8k/crypto/x509/x509_vfy.c 2008-07-13 07:33:15.000000000 -0700 -+++ openssl-0.9.8k/crypto/x509/x509_vfy.c 2009-10-05 14:58:27.137612533 -0700 +--- ../a/openssl-0.9.8k/crypto/x509/x509_vfy.c 2008-07-13 16:33:15.000000000 +0200 ++++ openssl-0.9.8k/crypto/x509/x509_vfy.c 2009-10-14 17:14:10.065926671 +0200 @@ -986,7 +986,11 @@ while (n >= 0) { @@ -70,8 +78,8 @@ ctx->error=X509_V_ERR_CERT_SIGNATURE_FAILURE; ctx->current_cert=xs; diff -ruN ../a/openssl-0.9.8k/ssl/ssl_algs.c openssl-0.9.8k/ssl/ssl_algs.c ---- ../a/openssl-0.9.8k/ssl/ssl_algs.c 2007-04-23 16:50:21.000000000 -0700 -+++ openssl-0.9.8k/ssl/ssl_algs.c 2009-10-05 14:58:27.140351704 -0700 +--- ../a/openssl-0.9.8k/ssl/ssl_algs.c 2007-04-24 01:50:21.000000000 +0200 ++++ openssl-0.9.8k/ssl/ssl_algs.c 2009-10-14 17:14:10.066124834 +0200 @@ -92,9 +92,6 @@ EVP_add_cipher(EVP_seed_cbc()); #endif