diff options
| author | Doug Hogan <doug@cvs.openbsd.org> | 2015-07-18 01:42:27 +0000 |
|---|---|---|
| committer | Doug Hogan <doug@cvs.openbsd.org> | 2015-07-18 01:42:27 +0000 |
| commit | 3da37385c7b5675050f0c850943619c3bbb13d3c (patch) | |
| tree | ac07bbfd110d30f5029e0019e35bf3541f634b52 /lib/libssl/s3_srvr.c | |
| parent | 89236c73e190cfc5eca18db02a6d4a697a8e52c4 (diff) | |
Remove support for the SSL_OP_TLS_D5_BUG compat hack from SSLeay.
This is a 17 year old workaround from SSLeay 0.9.0b. It was for
clients that send RSA client key exchange in TLS using SSLv3 format
(no length prefix).
ok jsing@
Diffstat (limited to 'lib/libssl/s3_srvr.c')
| -rw-r--r-- | lib/libssl/s3_srvr.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/libssl/s3_srvr.c b/lib/libssl/s3_srvr.c index e70f8af4406..cd5bc2a6cbc 100644 --- a/lib/libssl/s3_srvr.c +++ b/lib/libssl/s3_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_srvr.c,v 1.110 2015/07/14 05:16:47 doug Exp $ */ +/* $OpenBSD: s3_srvr.c,v 1.111 2015/07/18 01:42:26 doug Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1708,13 +1708,9 @@ ssl3_get_client_key_exchange(SSL *s) goto truncated; n2s(p, i); if (n != i + 2) { - if (!(s->options & SSL_OP_TLS_D5_BUG)) { - SSLerr( - SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG); - goto err; - } else - p -= 2; + SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, + SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG); + goto err; } else n = i; } |