diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2017-01-23 13:36:14 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2017-01-23 13:36:14 +0000 |
| commit | 7ade76e5057fd428d2a7e2f38051c5370bb8d79e (patch) | |
| tree | 49b43cc340f7ec571d272626a9dc8bdcbcf0d695 /lib/libssl/d1_meth.c | |
| parent | cd13ddbb9d3b9002e438550028b6b4196fe89182 (diff) | |
Split most of SSL_METHOD out into an internal variant, which is opaque.
Discussed with beck@
Diffstat (limited to 'lib/libssl/d1_meth.c')
| -rw-r--r-- | lib/libssl/d1_meth.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/lib/libssl/d1_meth.c b/lib/libssl/d1_meth.c index 4493aa180b3..fcd8906c456 100644 --- a/lib/libssl/d1_meth.c +++ b/lib/libssl/d1_meth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_meth.c,v 1.12 2017/01/23 10:22:06 jsing Exp $ */ +/* $OpenBSD: d1_meth.c,v 1.13 2017/01/23 13:36:13 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -65,7 +65,7 @@ static const SSL_METHOD *dtls1_get_method(int ver); -static const SSL_METHOD DTLSv1_method_data = { +static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = { .version = DTLS1_VERSION, .min_version = DTLS1_VERSION, .max_version = DTLS1_VERSION, @@ -78,21 +78,25 @@ static const SSL_METHOD DTLSv1_method_data = { .ssl_peek = ssl3_peek, .ssl_write = ssl3_write, .ssl_shutdown = dtls1_shutdown, + .ssl_pending = ssl3_pending, + .get_ssl_method = dtls1_get_method, + .get_timeout = dtls1_default_timeout, + .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl3_renegotiate, .ssl_renegotiate_check = ssl3_renegotiate_check, .ssl_get_message = dtls1_get_message, .ssl_read_bytes = dtls1_read_bytes, .ssl_write_bytes = dtls1_write_app_data_bytes, + .ssl3_enc = &DTLSv1_enc_data, +}; + +static const SSL_METHOD DTLSv1_method_data = { .ssl_dispatch_alert = dtls1_dispatch_alert, - .get_cipher_by_char = ssl3_get_cipher_by_char, - .put_cipher_by_char = ssl3_put_cipher_by_char, - .ssl_pending = ssl3_pending, .num_ciphers = ssl3_num_ciphers, .get_cipher = dtls1_get_cipher, - .get_ssl_method = dtls1_get_method, - .get_timeout = dtls1_default_timeout, - .ssl3_enc = &DTLSv1_enc_data, - .ssl_version = ssl_undefined_void_function, + .get_cipher_by_char = ssl3_get_cipher_by_char, + .put_cipher_by_char = ssl3_put_cipher_by_char, + .internal = &DTLSv1_method_internal_data, }; const SSL_METHOD * |