mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

Nuke SSLv3_enc_data.

Browse Source 
ok "flensing knife"
This commit is contained in:
jsing 2015-09-11 16:50:46 +00:00
parent b4905d9dee
commit 728e0fdb7f
4 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/libssl/s3_lib.c
View File

@ -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)
{

22
lib/libssl/src/ssl/s3_lib.c
View File

@ -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)
{

5
lib/libssl/src/ssl/ssl_locl.h
View File

@ -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);

5
lib/libssl/ssl_locl.h
View File

@ -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);