diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2007-02-23 20:13:40 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2007-02-23 20:13:40 +0000 |
| commit | 79f67018b00a17f501ca030545e28287f38e863e (patch) | |
| tree | d0d550bc790d54a7a28f14da9031c7b9d84a43fd | |
| parent | 090f0f3d0ccbadb2f7f60263defa2bde63fbba17 (diff) | |
| download | openssl-new-79f67018b00a17f501ca030545e28287f38e863e.tar.gz | |
Update from 0.9.7-stable
| -rw-r--r-- | ssl/ssl_ciph.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |