Comparar texto

Encuentra la diferencia entre dos archivos de texto

Editor live

Ocultar sin cambios

Sin ajuste de línea

Vista

Nivel de detalle

Resaltado de sintaxis

Diffchecker Desktop La forma más segura de usar Diffchecker. ¡Obtén la app de Diffchecker Desktop: tus diffs nunca salen de tu computadora!Obtener Desktop

Untitled diff

Creado hace 9 añosEl diff nunca expira

11 eliminaciones

Líneas
Total
Eliminado

Caracteres
Total
Eliminado

Para continuar usando esta función, actualice a Diffchecker Pro Ver precios

60 líneas

9 adiciones

Líneas
Total
Añadido

Caracteres
Total
Añadido

Para continuar usando esta función, actualice a Diffchecker Pro Ver precios

60 líneas

Index: ssl/s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c

===================================================================

index e94ee83..3cd7e3a 100644

--- a/ssl/s3_lib.c 2016-11-10 15:03:46.000000000 +0100

--- a/ssl/s3_lib.c

+++ b/ssl/s3_lib.c 2016-12-08 03:08:45.167225455 +0100

+++ b/ssl/s3_lib.c

@@ -3582,6 +3582,7 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL

@@ -3582,6 +3582,7 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,

STACK_OF(SSL_CIPHER) *prio, *allow;

int i, ii, ok;

unsigned long alg_k, alg_a, mask_k, mask_a;

+ int use_chacha = 0;

/* Let's see which ciphers we can support */

@@ -3610,13 +3611,20 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL

@@ -3610,13 +3611,20 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,

fprintf(stderr, "%p:%s\n", (void *)c, c->name);

}

#endif

+retry:

if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE || tls1_suiteb(s)) {

prio = srvr;

allow = clnt;

+ /* Use ChaCha20+Poly1305 iff it's client's most preferred cipher suite */

+ /* Use ChaCha20+Poly1305 if it's client's most preferred cipher suite */

+ if (sk_SSL_CIPHER_num(clnt) > 0) {

+ c = sk_SSL_CIPHER_value(clnt, 0);

+ if (c->algorithm_enc == SSL_CHACHA20POLY1305)

+ use_chacha = 1;

+ }

} else {

prio = clnt;

allow = srvr;

+ use_chacha = 1;

}

tls1_set_cert_validity(s);

@@ -3634,6 +3642,10 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL

@@ -3634,6 +3642,10 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,

DTLS_VERSION_GT(s->version, c->max_dtls)))

continue;

+ /* Skip ChaCha unless top client priority */

+ if ((c->algorithm_enc == SSL_CHACHA20POLY1305) && !use_chacha)

+ if (c->algorithm_enc == SSL_CHACHA20POLY1305 && !use_chacha)

+ continue;

mask_k = s->s3->tmp.mask_k;

mask_a = s->s3->tmp.mask_a;

#ifndef OPENSSL_NO_SRP

@@ -3687,6 +3699,15 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL

@@ -3687,6 +3699,14 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,

break;

}

+ if (ret == NULL && !use_chacha) {

+ /* If no shared cipher was found due to some unusual preferences, try

+ * again with CHACHA enabled even if not top priority */

+ use_chacha = 1;

+ goto retry;

+ }

return (ret);

}

Diferencias guardadas

Texto original

Abrir archivo

Index: ssl/s3_lib.c
===================================================================
--- a/ssl/s3_lib.c 2016-11-10 15:03:46.000000000 +0100
+++ b/ssl/s3_lib.c 2016-12-08 03:08:45.167225455 +0100
@@ -3582,6 +3582,7 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL
     STACK_OF(SSL_CIPHER) *prio, *allow;
     int i, ii, ok;
     unsigned long alg_k, alg_a, mask_k, mask_a;
+    int use_chacha = 0;
 
     /* Let's see which ciphers we can support */
 
@@ -3610,13 +3611,20 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL
         fprintf(stderr, "%p:%s\n", (void *)c, c->name);
     }
 #endif
-
+retry:
     if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE || tls1_suiteb(s)) {
         prio = srvr;
         allow = clnt;
+    /* Use ChaCha20+Poly1305 iff it's client's most preferred cipher suite */
+        if (sk_SSL_CIPHER_num(clnt) > 0) {
+            c = sk_SSL_CIPHER_value(clnt, 0);
+            if (c->algorithm_enc == SSL_CHACHA20POLY1305)
+                use_chacha = 1;
+        }
     } else {
         prio = clnt;
         allow = srvr;
+        use_chacha = 1;
     }
 
     tls1_set_cert_validity(s);
@@ -3634,6 +3642,10 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL
              DTLS_VERSION_GT(s->version, c->max_dtls)))
             continue;
 
+                /* Skip ChaCha unless top client priority */
+        if ((c->algorithm_enc == SSL_CHACHA20POLY1305) && !use_chacha)
+            continue;
+
         mask_k = s->s3->tmp.mask_k;
         mask_a = s->s3->tmp.mask_a;
 #ifndef OPENSSL_NO_SRP
@@ -3687,6 +3699,15 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL
             break;
         }
     }
+
+        if (ret == NULL && !use_chacha) {
+        /* If no shared cipher was found due to some unusual preferences, try
+         * again with CHACHA enabled even if not top priority */
+        use_chacha = 1;
+        goto retry;
+    }
+
+
     return (ret);
 }

Texto modificado

Abrir archivo

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index e94ee83..3cd7e3a 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3582,6 +3582,7 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
     STACK_OF(SSL_CIPHER) *prio, *allow;
     int i, ii, ok;
     unsigned long alg_k, alg_a, mask_k, mask_a;
+    int use_chacha = 0;
 
     /* Let's see which ciphers we can support */
 
@@ -3610,13 +3611,20 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
         fprintf(stderr, "%p:%s\n", (void *)c, c->name);
     }
 #endif
-
+retry:
     if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE || tls1_suiteb(s)) {
         prio = srvr;
         allow = clnt;
+        /* Use ChaCha20+Poly1305 if it's client's most preferred cipher suite */
+        if (sk_SSL_CIPHER_num(clnt) > 0) {
+            c = sk_SSL_CIPHER_value(clnt, 0);
+            if (c->algorithm_enc == SSL_CHACHA20POLY1305)
+                use_chacha = 1;
+        }
     } else {
         prio = clnt;
         allow = srvr;
+        use_chacha = 1;
     }
 
     tls1_set_cert_validity(s);
@@ -3634,6 +3642,10 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
              DTLS_VERSION_GT(s->version, c->max_dtls)))
             continue;
 
+        /* Skip ChaCha unless top client priority */
+        if (c->algorithm_enc == SSL_CHACHA20POLY1305 && !use_chacha)
+            continue;
+
         mask_k = s->s3->tmp.mask_k;
         mask_a = s->s3->tmp.mask_a;
 #ifndef OPENSSL_NO_SRP
@@ -3687,6 +3699,14 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
             break;
         }
     }
+
+    if (ret == NULL && !use_chacha) {
+        /* If no shared cipher was found due to some unusual preferences, try
+         * again with CHACHA enabled even if not top priority */
+        use_chacha = 1;
+        goto retry;
+    }
+
     return (ret);
 }