X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fs3_clnt.c;h=70c6533268a0ab26e2f8c954c41daebdab0136db;hp=9755a0feb2ee58ac40b3b47f7a0f0b798dec317a;hb=8b8e5bed233a2d8106296c8e460be252719e0fdd;hpb=09599b52d4e295c380512ba39958a11994d63401

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 9755a0feb2..70c6533268 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1079,9 +1079,7 @@ int ssl3_get_server_hello(SSL *s)
 	/* If it is a disabled cipher we didn't send it in client hello,
 	 * so return an error.
 	 */
-	if (c->algorithm_ssl & ct->mask_ssl ||
-		c->algorithm_mkey & ct->mask_k ||
-		c->algorithm_auth & ct->mask_a)
+	if (ssl_cipher_disabled(s, c))
 		{
 		al=SSL_AD_ILLEGAL_PARAMETER;
 		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_CIPHER_RETURNED);