Attachment 946546 Details for Bug 1152277 – revert upstream patch from upstream bug 549042

[patch] revert upstream patch from upstream bug 549042

scsv-not-extension-revert-moz549042.patch (text/plain), 988 bytes, created by Kai Engert (:kaie) (inactive account) on 2014-10-13 18:57:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Engert (:kaie) (inactive account)

Created: 2014-10-13 18:57:46 UTC

Size: 988 bytes

patch

obsolete

>diff --git a/lib/ssl/ssl3con.c b/lib/ssl/ssl3con.c
>--- a/lib/ssl/ssl3con.c
>+++ b/lib/ssl/ssl3con.c
>@@ -5082,19 +5082,19 @@ ssl3_SendClientHello(sslSocket *ss, PRBo
>     }
> 
>     /* how many suites does our PKCS11 support (regardless of policy)? */
>     num_suites = ssl3_config_match_init(ss);
>     if (!num_suites)
>     	return SECFailure;	/* ssl3_config_match_init has set error code. */
> 
>     /* HACK for SCSV in SSL 3.0.  On initial handshake, prepend SCSV,
>-     * only if TLS is disabled.
>+     * only if we're willing to complete an SSL 3.0 handshake.
>      */
>-    if (!ss->firstHsDone && !isTLS) {
>+    if (!ss->firstHsDone && ss->vrange.min == SSL_LIBRARY_VERSION_3_0) {
> 	/* Must set this before calling Hello Extension Senders, 
> 	 * to suppress sending of empty RI extension.
> 	 */
> 	ss->ssl3.hs.sendingSCSV = PR_TRUE;
>     }
> 
>     /* When we attempt session resumption (only), we must lock the sid to
>      * prevent races with other resumption connections that receive a

Actions: View | Diff

Attachments on bug 1152277: 946546