summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_lib.c
diff options
context:
space:
mode:
authorjsing <>2014-05-29 16:00:16 +0000
committerjsing <>2014-05-29 16:00:16 +0000
commit0a5975d055bee8398d6d64a3b24405f129531399 (patch)
treee07ac6c4959ebe2e5276d36c944d7ec20c8f2f6d /src/lib/libssl/d1_lib.c
parent5a23947bada0118f1c0ea2db615af0d007f09532 (diff)
downloadopenbsd-0a5975d055bee8398d6d64a3b24405f129531399.tar.gz
openbsd-0a5975d055bee8398d6d64a3b24405f129531399.tar.bz2
openbsd-0a5975d055bee8398d6d64a3b24405f129531399.zip
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@
Diffstat (limited to 'src/lib/libssl/d1_lib.c')
-rw-r--r--src/lib/libssl/d1_lib.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c
index 87bc9b68c6..4ee3e36168 100644
--- a/src/lib/libssl/d1_lib.c
+++ b/src/lib/libssl/d1_lib.c
@@ -86,6 +86,7 @@ SSL3_ENC_METHOD DTLSv1_enc_data = {
86 .server_finished_label_len = TLS_MD_SERVER_FINISH_CONST_SIZE, 86 .server_finished_label_len = TLS_MD_SERVER_FINISH_CONST_SIZE,
87 .alert_value = tls1_alert_code, 87 .alert_value = tls1_alert_code,
88 .export_keying_material = tls1_export_keying_material, 88 .export_keying_material = tls1_export_keying_material,
89 .enc_flags = SSL_ENC_FLAG_DTLS|SSL_ENC_FLAG_EXPLICIT_IV,
89}; 90};
90 91
91long 92long