diff options
| author |   jsing <jsing@openbsd.org> | 2015-09-11 17:35:36 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2015-09-11 17:35:36 +0000 |
| commit | ef4cc740e3c407a086a714cd44927e5a824cef43 (patch) | |
| tree | 6222ef2145798a18e7a9211b3fcbc1c984cdc948 /lib/libssl/src | |
| parent | Nuke ssl3_default_timeout(). (diff) | |
| download | wireguard-openbsd-ef4cc740e3c407a086a714cd44927e5a824cef43.tar.xz wireguard-openbsd-ef4cc740e3c407a086a714cd44927e5a824cef43.zip | |
Nuke ssl_bad_method().
ok "flensing knife"
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_lib.c | 10 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/ssl_locl.h | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/lib/libssl/src/ssl/ssl_lib.c b/lib/libssl/src/ssl/ssl_lib.c index 4eb1d78f176..fe73046366c 100644 --- a/lib/libssl/src/ssl/ssl_lib.c +++ b/lib/libssl/src/ssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.109 2015/09/11 17:29:36 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.110 2015/09/11 17:35:36 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -2533,14 +2533,6 @@ ssl_undefined_const_function(const SSL *s) return (0); } -SSL_METHOD * -ssl_bad_method(int ver) -{ - SSLerr(SSL_F_SSL_BAD_METHOD, - ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); - return (NULL); -} - const char * ssl_version_string(int ver) { diff --git a/lib/libssl/src/ssl/ssl_locl.h b/lib/libssl/src/ssl/ssl_locl.h index 897673c8d30..7249cabea51 100644 --- a/lib/libssl/src/ssl/ssl_locl.h +++ b/lib/libssl/src/ssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.116 2015/09/11 17:32:23 jsing Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.117 2015/09/11 17:35:36 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -543,7 +543,6 @@ struct ssl_aead_ctx_st { extern SSL3_ENC_METHOD ssl3_undef_enc_method; extern SSL_CIPHER ssl3_ciphers[]; -SSL_METHOD *ssl_bad_method(int ver); const char *ssl_version_string(int ver); uint16_t ssl_max_server_version(SSL *s); |