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/ssl.h | |
| 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/ssl.h')
| -rw-r--r-- | net/third_party/nss/ssl/ssl.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/third_party/nss/ssl/ssl.h b/net/third_party/nss/ssl/ssl.h index a2e3984..d87ae56 100644 --- a/net/third_party/nss/ssl/ssl.h +++ b/net/third_party/nss/ssl/ssl.h @@ -36,7 +36,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: ssl.h,v 1.36 2010/02/10 18:07:21 wtc%google.com Exp $ */ +/* $Id: ssl.h,v 1.38 2010/02/17 02:29:07 wtc%google.com Exp $ */ #ifndef __ssl_h_ #define __ssl_h_ @@ -123,7 +123,7 @@ SSL_IMPORT PRFileDesc *SSL_ImportFD(PRFileDesc *model, PRFileDesc *fd); #define SSL_ENABLE_DEFLATE 19 /* Enable TLS compression with */ /* DEFLATE (off by default) */ #define SSL_ENABLE_RENEGOTIATION 20 /* Values below (default: never) */ -#define SSL_REQUIRE_SAFE_NEGOTIATION 21 /* Peer must send Signalling */ +#define SSL_REQUIRE_SAFE_NEGOTIATION 21 /* Peer must send Signaling */ /* Cipher Suite Value (SCSV) or */ /* Renegotiation Info (RI) */ /* extension in ALL handshakes. */ @@ -207,9 +207,11 @@ SSL_IMPORT SECStatus SSL_CipherPolicyGet(PRInt32 cipher, PRInt32 *policy); /* Only renegotiate if the peer's hello bears the TLS renegotiation_info */ /* extension. This is safe renegotiation. */ #define SSL_RENEGOTIATE_REQUIRES_XTN ((PRBool)2) -/* Disallow all renegotiation in server sockets only, but allow clients */ +/* Disallow unsafe renegotiation in server sockets only, but allow clients */ /* to continue to renegotiate with vulnerable servers. */ -#define SSL_RENEGOTIATE_CLIENT_ONLY ((PRBool)3) +/* This value should only be used during the transition period when few */ +/* servers have been upgraded. */ +#define SSL_RENEGOTIATE_TRANSITIONAL ((PRBool)3) /* ** Reset the handshake state for fd. This will make the complete SSL |