From 0ced42e050e602dc9d5fea36250ab8335f8ab156 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 2 Nov 2016 11:52:22 +0000 Subject: [PATCH] Use ciphersuite id when matching if we've got one When matching a ciphersuite if we are given an id, make sure we use it otherwise we will match another ciphersuite which is identical except for the TLS version. Reviewed-by: Rich Salz --- ssl/ssl_ciph.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 0d46509b19..adccbfc4d8 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -859,6 +859,8 @@ static void ssl_cipher_apply_rule(uint32_t cipher_id, uint32_t alg_mkey, cp->algorithm_enc, cp->algorithm_mac, cp->min_tls, cp->algo_strength); #endif + if (cipher_id != 0 && (cipher_id != cp->id)) + continue; if (alg_mkey && !(alg_mkey & cp->algorithm_mkey)) continue; if (alg_auth && !(alg_auth & cp->algorithm_auth)) -- 2.25.1