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
This commit is contained in:
Elio Maldonado 2012-11-28 12:59:48 -08:00
parent c3296995e7
commit c5c74121b2
1 changed files with 2 additions and 15 deletions

View File

@ -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 */