usr/src/lib/openssl/Patches/25-6881996.patch
changeset 2 8f1801a322e9
parent 0 b34509ac961f
equal deleted inserted replaced
1:37d545eabfea 2:8f1801a322e9
     1 diff -ruN ../a/openssl-0.9.8k/CHANGES openssl-0.9.8k/CHANGES
     1 diff -ruN ../a/openssl-0.9.8k/CHANGES openssl-0.9.8k/CHANGES
     2 --- ../a/openssl-0.9.8k/CHANGES	2009-03-25 03:46:55.000000000 -0700
     2 --- ../a/openssl-0.9.8k/CHANGES	2009-03-25 11:46:55.000000000 +0100
     3 +++ openssl-0.9.8k/CHANGES	2009-10-05 14:58:27.131290179 -0700
     3 +++ openssl-0.9.8k/CHANGES	2009-10-14 17:14:10.064846541 +0200
     4 @@ -2,6 +2,13 @@
     4 @@ -2,6 +2,13 @@
     5   OpenSSL CHANGES
     5   OpenSSL CHANGES
     6   _______________
     6   _______________
     7  
     7  
     8 + Changes between 0.9.8k and 0.9.8l  [xx XXX xxxx]
     8 + Changes between 0.9.8k and 0.9.8l  [xx XXX xxxx]
    14 +
    14 +
    15   Changes between 0.9.8j and 0.9.8k  [25 Mar 2009]
    15   Changes between 0.9.8j and 0.9.8k  [25 Mar 2009]
    16  
    16  
    17    *) Don't set val to NULL when freeing up structures, it is freed up by
    17    *) Don't set val to NULL when freeing up structures, it is freed up by
    18 diff -ruN ../a/openssl-0.9.8k/crypto/evp/c_alld.c openssl-0.9.8k/crypto/evp/c_alld.c
    18 diff -ruN ../a/openssl-0.9.8k/crypto/evp/c_alld.c openssl-0.9.8k/crypto/evp/c_alld.c
    19 --- ../a/openssl-0.9.8k/crypto/evp/c_alld.c	2005-04-30 14:51:40.000000000 -0700
    19 --- ../a/openssl-0.9.8k/crypto/evp/c_alld.c	2005-04-30 23:51:40.000000000 +0200
    20 +++ openssl-0.9.8k/crypto/evp/c_alld.c	2009-10-05 14:58:27.139011742 -0700
    20 +++ openssl-0.9.8k/crypto/evp/c_alld.c	2009-10-14 17:14:10.065117156 +0200
    21 @@ -64,9 +64,6 @@
    21 @@ -64,9 +64,6 @@
    22  
    22  
    23  void OpenSSL_add_all_digests(void)
    23  void OpenSSL_add_all_digests(void)
    24  	{
    24  	{
    25 -#ifndef OPENSSL_NO_MD2
    25 -#ifndef OPENSSL_NO_MD2
    27 -#endif
    27 -#endif
    28  #ifndef OPENSSL_NO_MD4
    28  #ifndef OPENSSL_NO_MD4
    29  	EVP_add_digest(EVP_md4());
    29  	EVP_add_digest(EVP_md4());
    30  #endif
    30  #endif
    31 diff -ruN ../a/openssl-0.9.8k/crypto/opensslv.h openssl-0.9.8k/crypto/opensslv.h
    31 diff -ruN ../a/openssl-0.9.8k/crypto/opensslv.h openssl-0.9.8k/crypto/opensslv.h
    32 --- ../a/openssl-0.9.8k/crypto/opensslv.h	2009-10-05 15:32:36.329125471 -0700
    32 --- ../a/openssl-0.9.8k/crypto/opensslv.h	2009-10-14 17:13:51.667902897 +0200
    33 +++ openssl-0.9.8k/crypto/opensslv.h	2009-10-05 15:34:36.847601425 -0700
    33 +++ openssl-0.9.8k/crypto/opensslv.h	2009-10-14 17:14:28.797866461 +0200
    34 @@ -34,6 +34,7 @@
    34 @@ -32,6 +32,7 @@
       
    35  	" CVE-2009-1377" \
       
    36  	" CVE-2009-1378" \
       
    37  	" CVE-2009-1379" \
       
    38 +	" CVE-2009-2409" \
       
    39  	")"
       
    40  #else
       
    41  #define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8k 25 Mar 2009 " \
       
    42 @@ -39,6 +40,7 @@
    35  	" CVE-2009-1377" \
    43  	" CVE-2009-1377" \
    36  	" CVE-2009-1378" \
    44  	" CVE-2009-1378" \
    37  	" CVE-2009-1379" \
    45  	" CVE-2009-1379" \
    38 +	" CVE-2009-2409" \
    46 +	" CVE-2009-2409" \
    39  	")"
    47  	")"
    40  #endif
    48  #endif
    41  #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
    49  #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
    42 diff -ruN ../a/openssl-0.9.8k/crypto/x509/x509_vfy.c openssl-0.9.8k/crypto/x509/x509_vfy.c
    50 diff -ruN ../a/openssl-0.9.8k/crypto/x509/x509_vfy.c openssl-0.9.8k/crypto/x509/x509_vfy.c
    43 --- ../a/openssl-0.9.8k/crypto/x509/x509_vfy.c	2008-07-13 07:33:15.000000000 -0700
    51 --- ../a/openssl-0.9.8k/crypto/x509/x509_vfy.c	2008-07-13 16:33:15.000000000 +0200
    44 +++ openssl-0.9.8k/crypto/x509/x509_vfy.c	2009-10-05 14:58:27.137612533 -0700
    52 +++ openssl-0.9.8k/crypto/x509/x509_vfy.c	2009-10-14 17:14:10.065926671 +0200
    45 @@ -986,7 +986,11 @@
    53 @@ -986,7 +986,11 @@
    46  	while (n >= 0)
    54  	while (n >= 0)
    47  		{
    55  		{
    48  		ctx->error_depth=n;
    56  		ctx->error_depth=n;
    49 -		if (!xs->valid)
    57 -		if (!xs->valid)
    68 -				 * been declared trusted. */
    76 -				 * been declared trusted. */
    69  				{
    77  				{
    70  				ctx->error=X509_V_ERR_CERT_SIGNATURE_FAILURE;
    78  				ctx->error=X509_V_ERR_CERT_SIGNATURE_FAILURE;
    71  				ctx->current_cert=xs;
    79  				ctx->current_cert=xs;
    72 diff -ruN ../a/openssl-0.9.8k/ssl/ssl_algs.c openssl-0.9.8k/ssl/ssl_algs.c
    80 diff -ruN ../a/openssl-0.9.8k/ssl/ssl_algs.c openssl-0.9.8k/ssl/ssl_algs.c
    73 --- ../a/openssl-0.9.8k/ssl/ssl_algs.c	2007-04-23 16:50:21.000000000 -0700
    81 --- ../a/openssl-0.9.8k/ssl/ssl_algs.c	2007-04-24 01:50:21.000000000 +0200
    74 +++ openssl-0.9.8k/ssl/ssl_algs.c	2009-10-05 14:58:27.140351704 -0700
    82 +++ openssl-0.9.8k/ssl/ssl_algs.c	2009-10-14 17:14:10.066124834 +0200
    75 @@ -92,9 +92,6 @@
    83 @@ -92,9 +92,6 @@
    76  	EVP_add_cipher(EVP_seed_cbc());
    84  	EVP_add_cipher(EVP_seed_cbc());
    77  #endif
    85  #endif
    78  
    86  
    79 -#ifndef OPENSSL_NO_MD2
    87 -#ifndef OPENSSL_NO_MD2