projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
090f0f3
)
Update from 0.9.7-stable
author
Dr. Stephen Henson
<steve@openssl.org>
Fri, 23 Feb 2007 20:13:40 +0000
(20:13 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Fri, 23 Feb 2007 20:13:40 +0000
(20:13 +0000)
ssl/ssl_ciph.c
patch
|
blob
|
history
diff --git
a/ssl/ssl_ciph.c
b/ssl/ssl_ciph.c
index 495b1ce0e5187d9ba70ddaab5f5d202e002f40bb..2951d5043a2c799cb21d29dd331c9ec18778d28a 100644
(file)
--- 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))