b70c8423a2
- manual merge from master
26 lines
1000 B
Diff
26 lines
1000 B
Diff
diff -up nss/lib/ssl/sslsock.c.cbcrandomivoff nss/lib/ssl/sslsock.c
|
|
--- nss/lib/ssl/sslsock.c.cbcrandomivoff 2013-05-30 22:20:52.181292812 -0700
|
|
+++ nss/lib/ssl/sslsock.c 2013-05-30 22:20:52.194292913 -0700
|
|
@@ -152,7 +152,7 @@ static sslOptions ssl_defaults = {
|
|
3, /* enableRenegotiation (default: transitional) */
|
|
PR_FALSE, /* requireSafeNegotiation */
|
|
PR_FALSE, /* enableFalseStart */
|
|
- PR_TRUE, /* cbcRandomIV */
|
|
+ PR_FALSE, /* cbcRandomIV */ /* defaults to off for compatibility */
|
|
PR_FALSE /* enableOCSPStapling */
|
|
};
|
|
|
|
@@ -2906,9 +2906,9 @@ ssl_SetDefaultsFromEnvironment(void)
|
|
PR_TRUE));
|
|
}
|
|
ev = getenv("NSS_SSL_CBC_RANDOM_IV");
|
|
- 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 */
|