diff options
Diffstat (limited to 'chromium/net/third_party/nss/ssl/sslsecur.c')
| -rw-r--r-- | chromium/net/third_party/nss/ssl/sslsecur.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chromium/net/third_party/nss/ssl/sslsecur.c b/chromium/net/third_party/nss/ssl/sslsecur.c index 99538e532a6..e03d7f93abe 100644 --- a/chromium/net/third_party/nss/ssl/sslsecur.c +++ b/chromium/net/third_party/nss/ssl/sslsecur.c @@ -277,7 +277,7 @@ SSL_ReHandshake(PRFileDesc *fd, PRBool flushCache) /* SSL v2 protocol does not support subsequent handshakes. */ if (ss->version < SSL_LIBRARY_VERSION_3_0) { - PORT_SetError(SEC_ERROR_INVALID_ARGS); + PORT_SetError(SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2); rv = SECFailure; } else { ssl_GetSSL3HandshakeLock(ss); @@ -1237,7 +1237,6 @@ int ssl_SecureSend(sslSocket *ss, const unsigned char *buf, int len, int flags) { int rv = 0; - PRBool falseStart = PR_FALSE; SSL_TRC(2, ("%d: SSL[%d]: SecureSend: sending %d bytes", SSL_GETPID(), ss->fd, len)); @@ -1272,6 +1271,7 @@ ssl_SecureSend(sslSocket *ss, const unsigned char *buf, int len, int flags) ss->writerThread = PR_GetCurrentThread(); /* If any of these is non-zero, the initial handshake is not done. */ if (!ss->firstHsDone) { + PRBool falseStart = PR_FALSE; ssl_Get1stHandshakeLock(ss); if (ss->opt.enableFalseStart && ss->version >= SSL_LIBRARY_VERSION_3_0) { @@ -1398,10 +1398,6 @@ SSL_SetURL(PRFileDesc *fd, const char *url) SECStatus SSL_SetTrustAnchors(PRFileDesc *fd, CERTCertList *certList) { - PORT_SetError(PR_NOT_IMPLEMENTED_ERROR); - PR_NOT_REACHED("not implemented"); - return SECFailure; -#if 0 sslSocket * ss = ssl_FindSocket(fd); CERTDistNames *names = NULL; @@ -1429,7 +1425,6 @@ SSL_SetTrustAnchors(PRFileDesc *fd, CERTCertList *certList) ssl_Release1stHandshakeLock(ss); return SECSuccess; -#endif } /* |