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

[Kurt Roeckx]

Author: kroeckx
Date: 2015-03-20 21:22:40 +0000 (Fri, 20 Mar 2015)
New Revision: 724

Modified:
   openssl/branches/squeeze/debian/patches/0009-Fix-unsigned-signed-warnings.patch
Log:
Make patch apply.


Modified: openssl/branches/squeeze/debian/patches/0009-Fix-unsigned-signed-warnings.patch
===================================================================
--- openssl/branches/squeeze/debian/patches/0009-Fix-unsigned-signed-warnings.patch	2015-03-20 21:14:16 UTC (rev 723)
+++ openssl/branches/squeeze/debian/patches/0009-Fix-unsigned-signed-warnings.patch	2015-03-20 21:22:40 UTC (rev 724)
@@ -14,9 +14,9 @@
 
 Index: openssl-0.9.8o/ssl/s2_srvr.c
 ===================================================================
---- openssl-0.9.8o.orig/ssl/s2_srvr.c
-+++ openssl-0.9.8o/ssl/s2_srvr.c
-@@ -363,7 +363,8 @@ end:
+--- openssl-0.9.8o.orig/ssl/s2_srvr.c	2015-03-20 21:19:37.000000000 +0000
++++ openssl-0.9.8o/ssl/s2_srvr.c	2015-03-20 21:20:19.396662316 +0000
+@@ -363,7 +363,8 @@
  
  static int get_client_master_key(SSL *s)
  	{
@@ -26,7 +26,7 @@
  	unsigned long len;
  	unsigned char *p;
  	SSL_CIPHER *cp;
-@@ -481,7 +482,7 @@ static int get_client_master_key(SSL *s)
+@@ -481,7 +482,7 @@
       * must be zero).
       */
      if ((!is_export && s->s2->tmp.clear != 0) ||
@@ -35,7 +35,7 @@
          ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR);
          SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_BAD_LENGTH);
          return -1;
-@@ -492,7 +493,7 @@ static int get_client_master_key(SSL *s)
+@@ -492,7 +493,7 @@
       * bytes to fit the key in the buffer, stop now.
       */
      if ((is_export && s->s2->tmp.enc < ek) ||
@@ -44,12 +44,12 @@
          ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR);
          SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_LENGTH_TOO_SHORT);
          return -1;
-@@ -509,7 +510,7 @@ static int get_client_master_key(SSL *s)
+@@ -509,7 +510,7 @@
  	/* If a bad decrypt, continue with protocol but with a
  	 * random master secret (Bleichenbacher attack) */
          if ((i < 0) || ((!is_export && i != EVP_CIPHER_key_length(c))
--                    || (is_export && i != ek))) {
-+                    || (is_export && i != (int)ek))) {
+-                    || (is_export && i != ek)))
++                    || (is_export && i != (int)ek)))
  		{
  		ERR_clear_error();
  		if (is_export)