[nss/f18] Fix the first hunk so it does what's intended
Elio Maldonado
emaldonado at fedoraproject.org
Wed Nov 28 21:02:38 UTC 2012
commit c5c74121b268e15649afba06c65aceb6d9b11d89
Author: Elio Maldonado <emaldona at redhat.com>
Date: Wed Nov 28 12:59:48 2012 -0800
Fix the first hunk so it does what's intended
- Remove the second hunk so it applies, patch compliens it a previously appled change
- Must investigate why the second part seems to be applied already
nss-ssl-cbc-random-iv-off-by-default.patch | 17 ++---------------
1 files changed, 2 insertions(+), 15 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..2678580 100644
--- a/nss-ssl-cbc-random-iv-off-by-default.patch
+++ b/nss-ssl-cbc-random-iv-off-by-default.patch
@@ -5,21 +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 */
};
/*
-@@ -2833,9 +2833,9 @@ ssl_SetDefaultsFromEnvironment(void)
- 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"));
- }
- }
- #endif /* NSS_HAVE_GETENV */
More information about the scm-commits
mailing list