From 523d54282c543c650be946602c618cf48ec008de Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 29 May 2014 16:00:16 +0000
Subject: Make it substantially easier to identify protocol version
 requirements by adding an enc_flags field to the ssl3_enc_method, specifying
 four flags that are used with this field and providing macros for evaluating
 these conditions. Currently the version requirements are identified by
 continually checking the version number and other criteria.

This change also adds separate SSL3_ENC_METHOD data for TLS v1.1 and v1.2,
since they have different enc_flags from TLS v1.

Based on changes in OpenSSL head.

No objection from miod@
---
 src/lib/libssl/s3_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/libssl/s3_lib.c')

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 2f4ab38863..e3770bd0ae 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -2270,6 +2270,7 @@ SSL3_ENC_METHOD SSLv3_enc_data = {
 	.export_keying_material = (int (*)(SSL *, unsigned char *, size_t,
 	    const char *, size_t, const unsigned char *, size_t,
 	    int use_context))ssl_undefined_function,
+	.enc_flags = 0,
 };
 
 long
@@ -3062,7 +3063,6 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
 		emask_k = cert->export_mask_k;
 		emask_a = cert->export_mask_a;
 
-
 		alg_k = c->algorithm_mkey;
 		alg_a = c->algorithm_auth;
 
-- 
cgit v1.2.3-55-g6feb