| Index: net/third_party/nss/ssl/sslimpl.h
|
| diff --git a/net/third_party/nss/ssl/sslimpl.h b/net/third_party/nss/ssl/sslimpl.h
|
| index 1ea82dab8986b1a283c99cc1c8d469c206b35fdd..0a0808ad2178df769e0ae73ff547c8caf79171e0 100644
|
| --- a/net/third_party/nss/ssl/sslimpl.h
|
| +++ b/net/third_party/nss/ssl/sslimpl.h
|
| @@ -317,9 +317,9 @@ typedef struct {
|
| } ssl3CipherSuiteCfg;
|
|
|
| #ifdef NSS_ENABLE_ECC
|
| -#define ssl_V3_SUITES_IMPLEMENTED 50
|
| +#define ssl_V3_SUITES_IMPLEMENTED 59
|
| #else
|
| -#define ssl_V3_SUITES_IMPLEMENTED 30
|
| +#define ssl_V3_SUITES_IMPLEMENTED 39
|
| #endif /* NSS_ENABLE_ECC */
|
|
|
| typedef struct sslOptionsStr {
|
| @@ -1050,6 +1050,8 @@ struct sslSecurityInfoStr {
|
| CERTCertificate *localCert; /* ssl 2 & 3 */
|
| CERTCertificate *peerCert; /* ssl 2 & 3 */
|
| SECKEYPublicKey *peerKey; /* ssl3 only */
|
| + SECItem *userName; /* SSL username credential */
|
| + SECItem *userPasswd; /* SSL userpasswd credential */
|
|
|
| SSLSignType authAlgorithm;
|
| PRUint32 authKeyBits;
|
| @@ -1159,6 +1161,10 @@ const unsigned char * preferredCipher;
|
| SSLHandshakeCallback handshakeCallback;
|
| void *handshakeCallbackData;
|
| void *pkcs11PinArg;
|
| + SSLUserPasswdCB getUserPasswd;
|
| + void *getUserPasswdArg;
|
| + SSLGetSRPParamsCB getSRPParams;
|
| + void *getSRPParamsArg;
|
|
|
| PRIntervalTime rTimeout; /* timeout for NSPR I/O */
|
| PRIntervalTime wTimeout; /* timeout for NSPR I/O */
|
|
|