diff options
| author | jsing <> | 2017-01-26 00:42:44 +0000 |
|---|---|---|
| committer | jsing <> | 2017-01-26 00:42:44 +0000 |
| commit | 8321241552ee8f5d971f520d360475c3b3642cad (patch) | |
| tree | 32974d9a5d142477eb7229916f98dc9d11938d24 /src/lib/libssl/ssl_lib.c | |
| parent | 1e5109bf125109318a8f73976ccf2e4e8b740ce3 (diff) | |
| download | openbsd-8321241552ee8f5d971f520d360475c3b3642cad.tar.gz openbsd-8321241552ee8f5d971f520d360475c3b3642cad.tar.bz2 openbsd-8321241552ee8f5d971f520d360475c3b3642cad.zip | |
Remove ssl3_undef_enc_method - if we have internal bugs we want to segfault
so that we can debug it, rather than adding a "should not be called" error
to the stack.
Discussed with beck@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_lib.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 8afb4909c3..649b238bd9 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_lib.c,v 1.150 2017/01/25 10:54:23 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.151 2017/01/26 00:42:44 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -159,33 +159,6 @@ | |||
| 159 | 159 | ||
| 160 | const char *SSL_version_str = OPENSSL_VERSION_TEXT; | 160 | const char *SSL_version_str = OPENSSL_VERSION_TEXT; |
| 161 | 161 | ||
| 162 | SSL3_ENC_METHOD ssl3_undef_enc_method = { | ||
| 163 | /* | ||
| 164 | * Evil casts, but these functions are only called if there's a | ||
| 165 | * library bug. | ||
| 166 | */ | ||
| 167 | .enc = (int (*)(SSL *, int))ssl_undefined_function, | ||
| 168 | .mac = (int (*)(SSL *, unsigned char *, int))ssl_undefined_function, | ||
| 169 | .setup_key_block = ssl_undefined_function, | ||
| 170 | .generate_master_secret = (int (*)(SSL *, unsigned char *, | ||
| 171 | unsigned char *, int))ssl_undefined_function, | ||
| 172 | .change_cipher_state = (int (*)(SSL*, int))ssl_undefined_function, | ||
| 173 | .final_finish_mac = (int (*)(SSL *, const char*, int, | ||
| 174 | unsigned char *))ssl_undefined_function, | ||
| 175 | .finish_mac_length = 0, | ||
| 176 | .cert_verify_mac = (int (*)(SSL *, int, | ||
| 177 | unsigned char *))ssl_undefined_function, | ||
| 178 | .client_finished_label = NULL, | ||
| 179 | .client_finished_label_len = 0, | ||
| 180 | .server_finished_label = NULL, | ||
| 181 | .server_finished_label_len = 0, | ||
| 182 | .alert_value = (int (*)(int))ssl_undefined_function, | ||
| 183 | .export_keying_material = (int (*)(SSL *, unsigned char *, size_t, | ||
| 184 | const char *, size_t, const unsigned char *, size_t, | ||
| 185 | int use_context))ssl_undefined_function, | ||
| 186 | .enc_flags = 0, | ||
| 187 | }; | ||
| 188 | |||
| 189 | int | 162 | int |
| 190 | SSL_clear(SSL *s) | 163 | SSL_clear(SSL *s) |
| 191 | { | 164 | { |
