diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-05-29 16:00:17 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-05-29 16:00:17 +0000 |
| commit | 3010231939e2976c18b55001b142ce6d62f28133 (patch) | |
| tree | 3709baf37e0cae74c53bb2fd721fef483e0fef44 /lib/libssl/ssl_lib.c | |
| parent | e47a93fbe6ff2f3a4d4e5516cf809d11c61e17c9 (diff) | |
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 'lib/libssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index f1c92ee2f62..6cc02c8d7a1 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -182,6 +182,7 @@ SSL3_ENC_METHOD ssl3_undef_enc_method = { .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, }; int |