You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.6 KiB
42 lines
1.6 KiB
diff -up openssl-1.0.1e/ssl/s2_srvr.c.ssl2-ciphers openssl-1.0.1e/ssl/s2_srvr.c |
|
--- openssl-1.0.1e/ssl/s2_srvr.c.ssl2-ciphers 2016-01-14 17:38:50.000000000 +0100 |
|
+++ openssl-1.0.1e/ssl/s2_srvr.c 2016-02-16 16:18:59.790225008 +0100 |
|
@@ -392,7 +392,7 @@ static int get_client_master_key(SSL *s) |
|
} |
|
|
|
cp=ssl2_get_cipher_by_char(p); |
|
- if (cp == NULL) |
|
+ if (cp == NULL || sk_SSL_CIPHER_find(s->session->ciphers, cp) < 0) |
|
{ |
|
ssl2_return_error(s,SSL2_PE_NO_CIPHER); |
|
SSLerr(SSL_F_GET_CLIENT_MASTER_KEY, SSL_R_NO_CIPHER_MATCH); |
|
@@ -692,9 +692,13 @@ static int get_client_hello(SSL *s) |
|
prio = cs; |
|
allow = cl; |
|
} |
|
+ |
|
+ /* Generate list of SSLv2 ciphers shared between client and server */ |
|
for (z=0; z<sk_SSL_CIPHER_num(prio); z++) |
|
{ |
|
- if (sk_SSL_CIPHER_find(allow,sk_SSL_CIPHER_value(prio,z)) < 0) |
|
+ const SSL_CIPHER *cp = sk_SSL_CIPHER_value(prio, z); |
|
+ if ((cp->algorithm_ssl & SSL_SSLV2) == 0 || |
|
+ sk_SSL_CIPHER_find(allow,cp) < 0) |
|
{ |
|
(void)sk_SSL_CIPHER_delete(prio,z); |
|
z--; |
|
@@ -705,6 +709,14 @@ static int get_client_hello(SSL *s) |
|
sk_SSL_CIPHER_free(s->session->ciphers); |
|
s->session->ciphers = prio; |
|
} |
|
+ |
|
+ /* Make sure we have at least one cipher in common */ |
|
+ if (sk_SSL_CIPHER_num(s->session->ciphers) == 0) |
|
+ { |
|
+ ssl2_return_error(s, SSL2_PE_NO_CIPHER); |
|
+ SSLerr(SSL_F_GET_CLIENT_HELLO, SSL_R_NO_CIPHER_MATCH); |
|
+ return -1; |
|
+ } |
|
/* s->session->ciphers should now have a list of |
|
* ciphers that are on both the client and server. |
|
* This list is ordered by the order the client sent
|
|
|