diff options
author | jsing <> | 2021-07-01 17:53:39 +0000 |
---|---|---|
committer | jsing <> | 2021-07-01 17:53:39 +0000 |
commit | a0afc1b4032278e02db285a67fa2e295e9970176 (patch) | |
tree | 57d97f559edf3211313bbaee593ec7483ded13e4 /src/lib/libssl/t1_enc.c | |
parent | bd1a6cca8085312ddc750a73ac51cba9231bfcf6 (diff) | |
download | openbsd-a0afc1b4032278e02db285a67fa2e295e9970176.tar.gz openbsd-a0afc1b4032278e02db285a67fa2e295e9970176.tar.bz2 openbsd-a0afc1b4032278e02db285a67fa2e295e9970176.zip |
Merge SSL_METHOD_INTERNAL into SSL_METHOD.
Now that SSL_METHOD is opaque and in internal headers, we can remove
SSL_METHOD_INTERNAL by merging it back into SSL_METHOD.
ok tb@
Diffstat (limited to 'src/lib/libssl/t1_enc.c')
-rw-r--r-- | src/lib/libssl/t1_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c index 15afb1bae8..65e2063398 100644 --- a/src/lib/libssl/t1_enc.c +++ b/src/lib/libssl/t1_enc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t1_enc.c,v 1.150 2021/06/13 15:34:41 jsing Exp $ */ | 1 | /* $OpenBSD: t1_enc.c,v 1.151 2021/07/01 17:53:39 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -389,7 +389,7 @@ tls1_setup_key_block(SSL *s) | |||
389 | key_block = NULL; | 389 | key_block = NULL; |
390 | 390 | ||
391 | if (!(s->internal->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) && | 391 | if (!(s->internal->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) && |
392 | s->method->internal->version <= TLS1_VERSION) { | 392 | s->method->version <= TLS1_VERSION) { |
393 | /* | 393 | /* |
394 | * Enable vulnerability countermeasure for CBC ciphers with | 394 | * Enable vulnerability countermeasure for CBC ciphers with |
395 | * known-IV problem (http://www.openssl.org/~bodo/tls-cbc.txt) | 395 | * known-IV problem (http://www.openssl.org/~bodo/tls-cbc.txt) |