[nss/f17] Update nss-ssl-cbc-random-iv-off-by-default.patch to account for code upstream code changes

Elio Maldonado emaldonado at fedoraproject.org
Sat Nov 24 02:11:29 UTC 2012


commit aec3543d419d7705f3a799a0a2594e1b1a1ddc43
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Nov 23 18:10:26 2012 -0800

    Update nss-ssl-cbc-random-iv-off-by-default.patch to account for code upstream code changes

 nss-ssl-cbc-random-iv-off-by-default.patch |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/nss-ssl-cbc-random-iv-off-by-default.patch b/nss-ssl-cbc-random-iv-off-by-default.patch
index 04ecf64..9f25aa2 100644
--- a/nss-ssl-cbc-random-iv-off-by-default.patch
+++ b/nss-ssl-cbc-random-iv-off-by-default.patch
@@ -5,8 +5,8 @@ diff -up ./mozilla/security/nss/lib/ssl/sslsock.c.770682 ./mozilla/security/nss/
      3,          /* enableRenegotiation (default: transitional) */
      PR_FALSE,   /* requireSafeNegotiation */
      PR_FALSE,   /* enableFalseStart   */
--    PR_FALSE    /* cbcRandomIV        */ /* defaults to off for compatibility */
-+    PR_TRUE     /* cbcRandomIV        */
+-    PR_TRUE     /* cbcRandomIV        */
++    PR_FALSE    /* cbcRandomIV        */ /* defaults to off for compatibility */
  };
  
  /*
@@ -14,12 +14,12 @@ diff -up ./mozilla/security/nss/lib/ssl/sslsock.c.770682 ./mozilla/security/nss/
  	                PR_TRUE));
  	}
  	ev = getenv("NSS_SSL_CBC_RANDOM_IV");
--	if (ev && ev[0] == '1') {
--	    ssl_defaults.cbcRandomIV = PR_TRUE;
--	    SSL_TRACE(("SSL: cbcRandomIV set to 1"));
-+	if (ev && ev[0] == '0') {
-+	    ssl_defaults.cbcRandomIV = PR_FALSE;
-+	    SSL_TRACE(("SSL: cbcRandomIV set to 0"));
+-	if (ev && ev[0] == '0') {
+-	    ssl_defaults.cbcRandomIV = PR_FALSE;
+-	    SSL_TRACE(("SSL: cbcRandomIV set to 0"));
++	if (ev && ev[0] == '1') {
++	    ssl_defaults.cbcRandomIV = PR_TRUE;
++	    SSL_TRACE(("SSL: cbcRandomIV set to 1"));
  	}
      }
  #endif /* NSS_HAVE_GETENV */


More information about the scm-commits mailing list