diff options
author | Richard Levitte <levitte@openssl.org> | 2001-11-15 11:15:05 +0300 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2001-11-15 11:15:05 +0300 |
commit | 8d5c834b34703018890c7b11fd7dc1995039f9fd (patch) | |
tree | 085dab84d73e493a889e168eb96a92912e41a951 /ssl | |
parent | b0eda65f1cf5db967664b6d05515b03ebb9a2d23 (diff) |
Merg in latest changes from 0.9.6-stable.
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/s2_srvr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c index 4f1686a00c..af58b25071 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -470,8 +470,8 @@ static int get_client_master_key(SSL *s) * random master secret (Bleichenbacher attack) */ if ((i < 0) || ((!is_export && (i != EVP_CIPHER_key_length(c))) - || (is_export && ((i != ek) || (s->s2->tmp.clear+i != - EVP_CIPHER_key_length(c)))))) + || (is_export && ((i != ek) || (s->s2->tmp.clear+(unsigned int)i != + (unsigned int)EVP_CIPHER_key_length(c)))))) { ERR_clear_error(); if (is_export) |