diff options
Diffstat (limited to 'net/third_party')
| -rw-r--r-- | net/third_party/nss/README.google | 2 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/ssl.def | 2 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/ssl.h | 8 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/sslenum.c | 16 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/sslimpl.h | 6 |
5 files changed, 26 insertions, 8 deletions
diff --git a/net/third_party/nss/README.google b/net/third_party/nss/README.google index d34e65e..ce46e1a 100644 --- a/net/third_party/nss/README.google +++ b/net/third_party/nss/README.google @@ -1,7 +1,7 @@ This directory includes a copy of NSS's libssl from the CVS repo at: :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot -The snapshot was updated to the CVS tag: NSS_3_12_6_BETA1 +The snapshot was updated to the CVS tag: NSS_3_12_6_RC0 Patches: diff --git a/net/third_party/nss/ssl/ssl.def b/net/third_party/nss/ssl/ssl.def index 287505f..a1f4b51 100644 --- a/net/third_party/nss/ssl/ssl.def +++ b/net/third_party/nss/ssl/ssl.def @@ -142,7 +142,9 @@ SSL_CanBypass; ;+NSS_3.12.6 { # NSS 3.12.6 release ;+ global: SSL_ConfigServerSessionIDCacheWithOpt; +SSL_GetImplementedCiphers; SSL_GetNegotiatedHostInfo; +SSL_GetNumImplementedCiphers; SSL_HandshakeNegotiatedExtension; SSL_ReconfigFD; SSL_SetTrustAnchors; diff --git a/net/third_party/nss/ssl/ssl.h b/net/third_party/nss/ssl/ssl.h index 5b572b2..b0e77df 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.35 2010/02/04 03:21:11 wtc%google.com Exp $ */ +/* $Id: ssl.h,v 1.36 2010/02/10 18:07:21 wtc%google.com Exp $ */ #ifndef __ssl_h_ #define __ssl_h_ @@ -61,9 +61,15 @@ SEC_BEGIN_PROTOS /* constant table enumerating all implemented SSL 2 and 3 cipher suites. */ SSL_IMPORT const PRUint16 SSL_ImplementedCiphers[]; +/* the same as the above, but is a function */ +SSL_IMPORT const PRUint16 *SSL_GetImplementedCiphers(void); + /* number of entries in the above table. */ SSL_IMPORT const PRUint16 SSL_NumImplementedCiphers; +/* the same as the above, but is a function */ +SSL_IMPORT PRUint16 SSL_GetNumImplementedCiphers(void); + /* Macro to tell which ciphers in table are SSL2 vs SSL3/TLS. */ #define SSL_IS_SSL2_CIPHER(which) (((which) & 0xfff0) == 0xff00) diff --git a/net/third_party/nss/ssl/sslenum.c b/net/third_party/nss/ssl/sslenum.c index fa834f9..b8aa8cc 100644 --- a/net/third_party/nss/ssl/sslenum.c +++ b/net/third_party/nss/ssl/sslenum.c @@ -39,7 +39,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: sslenum.c,v 1.16 2008/12/17 06:09:19 nelson%bolyard.com Exp $ */ +/* $Id: sslenum.c,v 1.17 2010/02/10 18:07:21 wtc%google.com Exp $ */ #include "ssl.h" #include "sslproto.h" @@ -54,6 +54,9 @@ * such as AES and RC4 to allow servers that prefer Camellia to negotiate * Camellia without having to disable AES and RC4, which are needed for * interoperability with clients that don't yet implement Camellia. + * + * If new ECC cipher suites are added, also update the ssl3CipherSuite arrays + * in ssl3ecc.c. */ const PRUint16 SSL_ImplementedCiphers[] = { /* 256-bit */ @@ -149,3 +152,14 @@ const PRUint16 SSL_ImplementedCiphers[] = { const PRUint16 SSL_NumImplementedCiphers = (sizeof SSL_ImplementedCiphers) / (sizeof SSL_ImplementedCiphers[0]) - 1; +const PRUint16 * +SSL_GetImplementedCiphers(void) +{ + return SSL_ImplementedCiphers; +} + +PRUint16 +SSL_GetNumImplementedCiphers(void) +{ + return SSL_NumImplementedCiphers; +} diff --git a/net/third_party/nss/ssl/sslimpl.h b/net/third_party/nss/ssl/sslimpl.h index 0ec579d..0658d2c 100644 --- a/net/third_party/nss/ssl/sslimpl.h +++ b/net/third_party/nss/ssl/sslimpl.h @@ -39,7 +39,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: sslimpl.h,v 1.76 2010/02/04 03:08:45 wtc%google.com Exp $ */ +/* $Id: sslimpl.h,v 1.77 2010/02/10 00:33:50 wtc%google.com Exp $ */ #ifndef __sslimpl_h_ #define __sslimpl_h_ @@ -130,11 +130,7 @@ extern int Debug; #define SSL_DBG(b) #endif -#ifdef macintosh -#include "pprthred.h" -#else #include "private/pprthred.h" /* for PR_InMonitor() */ -#endif #define ssl_InMonitor(m) PZ_InMonitor(m) #define LSB(x) ((unsigned char) ((x) & 0xff)) |