diff options
| author | kris <kris@FreeBSD.org> | 2001-07-19 20:05:28 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2001-07-19 20:05:28 +0000 |
| commit | 18cbcd5effa4ebab72f9f535e44a5fbef433d087 (patch) | |
| tree | b2d3a3c4344c814837ab109307bb7509bb253496 /crypto/openssl/ssl | |
| parent | 84fabcda925860c067e7f03b07d3a988add59e0b (diff) | |
| download | FreeBSD-src-18cbcd5effa4ebab72f9f535e44a5fbef433d087.zip FreeBSD-src-18cbcd5effa4ebab72f9f535e44a5fbef433d087.tar.gz | |
Resolve conflicts
Diffstat (limited to 'crypto/openssl/ssl')
| -rw-r--r-- | crypto/openssl/ssl/s2_srvr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s2_srvr.c b/crypto/openssl/ssl/s2_srvr.c index 2f3ec61..13a9f88 100644 --- a/crypto/openssl/ssl/s2_srvr.c +++ b/crypto/openssl/ssl/s2_srvr.c @@ -407,12 +407,13 @@ static int get_client_master_key(SSL *s) /* bad decrypt */ #if 1 /* If a bad decrypt, continue with protocol but with a - * dud master secret */ + * 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)))))) { + ERR_clear_error(); if (is_export) i=ek; else |
