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