diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 16:48:59 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 16:48:59 +0000 |
| commit | a65b40124becc4fa82224f40012a8deb29ded66a (patch) | |
| tree | cf5e6ff5b2bf2416d25ed8f03347edbe3cb64821 /net/third_party/nss/ssl/sslsock.c | |
| parent | 33e9215cf129c9ede3bc373119bda7c3093262aa (diff) | |
| download | chromium_src-a65b40124becc4fa82224f40012a8deb29ded66a.zip chromium_src-a65b40124becc4fa82224f40012a8deb29ded66a.tar.gz chromium_src-a65b40124becc4fa82224f40012a8deb29ded66a.tar.bz2 | |
Update to NSS 3.12.7.
R=agl
BUG=51694
TEST=No build errors or test failures.
Review URL: http://codereview.chromium.org/3177012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss/ssl/sslsock.c')
| -rw-r--r-- | net/third_party/nss/ssl/sslsock.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsock.c index c4611a0..ca0d714 100644 --- a/net/third_party/nss/ssl/sslsock.c +++ b/net/third_party/nss/ssl/sslsock.c @@ -40,7 +40,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: sslsock.c,v 1.64 2010/01/28 06:19:13 nelson%bolyard.com Exp $ */ +/* $Id: sslsock.c,v 1.67 2010/04/25 23:37:38 nelson%bolyard.com Exp $ */ #include "seccomon.h" #include "cert.h" #include "keyhi.h" @@ -329,7 +329,7 @@ ssl_DupSocket(sslSocket *os) ss->ephemeralECDHKeyPair = !os->ephemeralECDHKeyPair ? NULL : ssl3_GetKeyPairRef(os->ephemeralECDHKeyPair); /* - * XXX the preceeding CERT_ and SECKEY_ functions can fail and return NULL. + * XXX the preceding CERT_ and SECKEY_ functions can fail and return NULL. * XXX We should detect this, and not just march on with NULL pointers. */ ss->authCertificate = os->authCertificate; @@ -2390,10 +2390,10 @@ ssl_NewSocket(PRBool makeLocks) ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_UNRESTRICTED; else if (ev[0] == '0' || LOWER(ev[0]) == 'n') ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_NEVER; - else if (ev[0] == '3' || LOWER(ev[0]) == 'c') - ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_CLIENT_ONLY; - else - ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_REQUIRES_XTN; + else if (ev[0] == '2' || LOWER(ev[0]) == 'r') + ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_REQUIRES_XTN; + else if (ev[0] == '3' || LOWER(ev[0]) == 't') + ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_TRANSITIONAL; SSL_TRACE(("SSL: enableRenegotiation set to %d", ssl_defaults.enableRenegotiation)); } |