[Pkg-openssl-changes] r742 - openssl/branches/squeeze/debian/patches

[Kurt Roeckx]

Author: kroeckx
Date: 2015-06-17 21:22:38 +0000 (Wed, 17 Jun 2015)
New Revision: 742

Modified:
   openssl/branches/squeeze/debian/patches/CVE-2015-4000.patch
Log:
Make it build.


Modified: openssl/branches/squeeze/debian/patches/CVE-2015-4000.patch
===================================================================
--- openssl/branches/squeeze/debian/patches/CVE-2015-4000.patch	2015-06-17 21:18:04 UTC (rev 741)
+++ openssl/branches/squeeze/debian/patches/CVE-2015-4000.patch	2015-06-17 21:22:38 UTC (rev 742)
@@ -34,11 +34,11 @@
 -		SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_RSA_CERT);
 -		goto f_err;
 -		}
-+        if ((alg_k & SSL_kEDH) && dh == NULL) {
++        if ((algs & SSL_kEDH) && dh == NULL) {
 +            SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, ERR_R_INTERNAL_ERROR);
 +            goto f_err;
 +        }
-+        if ((alg_k & SSL_kDHr) && !has_bits(i, EVP_PK_DH | EVP_PKS_RSA)) {
++        if ((algs & SSL_kDHr) && !has_bits(i, EVP_PK_DH | EVP_PKS_RSA)) {
 +            SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,
 +                   SSL_R_MISSING_DH_RSA_CERT);
 +            goto f_err;
@@ -53,7 +53,7 @@
  #endif
 -#endif
 +        /* Check DHE only: static DH not implemented. */
-+        if (alg_k & SSL_kEDH) {
++        if (algs & SSL_kEDH) {
 +            int dh_size = BN_num_bits(dh->p);
 +            if ((!SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && dh_size < 768)
 +                || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && dh_size < 512)) {