summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_enc.c
diff options
context:
space:
mode:
authorjsing <>2017-01-23 14:35:42 +0000
committerjsing <>2017-01-23 14:35:42 +0000
commitd43892e9652017c33ea2cf69639dc9a01090be5f (patch)
tree27eab6f3272b4b46f77e786896eae8e697800969 /src/lib/libssl/t1_enc.c
parent0eff443f2ac1ae9043870f2d40d9dc0d57f236d6 (diff)
downloadopenbsd-d43892e9652017c33ea2cf69639dc9a01090be5f.tar.gz
openbsd-d43892e9652017c33ea2cf69639dc9a01090be5f.tar.bz2
openbsd-d43892e9652017c33ea2cf69639dc9a01090be5f.zip
Move options and mode from SSL_CTX and SSL to internal, since these can be
set and cleared via existing functions.
Diffstat (limited to 'src/lib/libssl/t1_enc.c')
-rw-r--r--src/lib/libssl/t1_enc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index c0abe762e6..3181b63e39 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.92 2017/01/23 13:36:13 jsing Exp $ */ 1/* $OpenBSD: t1_enc.c,v 1.93 2017/01/23 14:35:42 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 *
@@ -783,7 +783,7 @@ tls1_setup_key_block(SSL *s)
783 if (!tls1_generate_key_block(s, key_block, tmp_block, key_block_len)) 783 if (!tls1_generate_key_block(s, key_block, tmp_block, key_block_len))
784 goto err; 784 goto err;
785 785
786 if (!(s->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) && 786 if (!(s->internal->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) &&
787 s->method->internal->version <= TLS1_VERSION) { 787 s->method->internal->version <= TLS1_VERSION) {
788 /* 788 /*
789 * Enable vulnerability countermeasure for CBC ciphers with 789 * Enable vulnerability countermeasure for CBC ciphers with