diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2015-09-11 16:50:47 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2015-09-11 16:50:47 +0000 |
| commit | 3266e970f97c44993a98a9f34b51843bb2d130f3 (patch) | |
| tree | 073a7035305aa67d43af76a9c7fb65cc3a04af10 /lib | |
| parent | 49bb299c50666361620f60924081193cec75bc4a (diff) | |
Nuke SSLv3_enc_data.
ok "flensing knife"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/s3_lib.c | 22 | ||||
| -rw-r--r-- | lib/libssl/ssl_locl.h | 5 |
2 files changed, 3 insertions, 24 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c index 4e6b1236983..b68aaabbbf8 100644 --- a/lib/libssl/s3_lib.c +++ b/lib/libssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.101 2015/09/10 15:56:26 jsing Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.102 2015/09/11 16:50:46 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1896,26 +1896,6 @@ SSL_CIPHER ssl3_ciphers[] = { /* end of list */ }; -SSL3_ENC_METHOD SSLv3_enc_data = { - .enc = ssl3_enc, - .mac = n_ssl3_mac, - .setup_key_block = ssl3_setup_key_block, - .generate_master_secret = ssl3_generate_master_secret, - .change_cipher_state = ssl3_change_cipher_state, - .final_finish_mac = ssl3_final_finish_mac, - .finish_mac_length = MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH, - .cert_verify_mac = ssl3_cert_verify_mac, - .client_finished_label = SSL3_MD_CLIENT_FINISHED_CONST, - .client_finished_label_len = 4, - .server_finished_label = SSL3_MD_SERVER_FINISHED_CONST, - .server_finished_label_len = 4, - .alert_value = ssl3_alert_code, - .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 ssl3_default_timeout(void) { diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index ea14ae03989..8ad1535979f 100644 --- a/lib/libssl/ssl_locl.h +++ b/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.104 2015/09/11 16:28:37 jsing Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.105 2015/09/11 16:50:46 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -547,11 +547,10 @@ SSL_METHOD *ssl_bad_method(int ver); const char *ssl_version_string(int ver); uint16_t ssl_max_server_version(SSL *s); +extern SSL3_ENC_METHOD DTLSv1_enc_data; extern SSL3_ENC_METHOD TLSv1_enc_data; extern SSL3_ENC_METHOD TLSv1_1_enc_data; extern SSL3_ENC_METHOD TLSv1_2_enc_data; -extern SSL3_ENC_METHOD SSLv3_enc_data; -extern SSL3_ENC_METHOD DTLSv1_enc_data; void ssl_clear_cipher_ctx(SSL *s); int ssl_clear_bad_session(SSL *s); |