From: Dr. Stephen Henson Date: Fri, 23 Feb 2007 20:13:40 +0000 (+0000) Subject: Update from 0.9.7-stable X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=79f67018b00a17f501ca030545e28287f38e863e;p=oweals%2Fopenssl.git Update from 0.9.7-stable --- diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 495b1ce0e5..2951d5043a 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -489,7 +489,7 @@ static void ssl_cipher_collect_ciphers(const SSL_METHOD *ssl_method, /* drop those that use any of that is not available */ #define IS_MASKED(c) ((c)->algorithms & (((c)->alg_bits == 256) ? m256 : mask)) #ifdef OPENSSL_FIPS - if ((c != NULL) && c->valid && !IS_MASKED(c)) + if ((c != NULL) && c->valid && !IS_MASKED(c) && (!FIPS_mode() || (c->algo_strength & SSL_FIPS))) #else if ((c != NULL) && c->valid && !IS_MASKED(c))