diff options
author | jsing <> | 2019-03-25 16:37:52 +0000 |
---|---|---|
committer | jsing <> | 2019-03-25 16:37:52 +0000 |
commit | 42a11c8897b7bbb7bcb07484b3b02dd1fbcd3454 (patch) | |
tree | b56bbef545783acbb4c84b169052a4c8e80f0f76 /src/lib | |
parent | 4e5f1e0420a23688bec26a60ba7f49ffdd33ba62 (diff) | |
download | openbsd-42a11c8897b7bbb7bcb07484b3b02dd1fbcd3454.tar.gz openbsd-42a11c8897b7bbb7bcb07484b3b02dd1fbcd3454.tar.bz2 openbsd-42a11c8897b7bbb7bcb07484b3b02dd1fbcd3454.zip |
Remove ssl_get_server_send_cert() which is now unused.
ok beck@ tb@
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 13 | ||||
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 3 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index f5747fa5f9..52ede46f7e 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.201 2019/01/22 01:15:37 tb Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.202 2019/03/25 16:37:52 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 | * |
@@ -2093,17 +2093,6 @@ ssl_get_server_send_pkey(const SSL *s) | |||
2093 | return (c->pkeys + i); | 2093 | return (c->pkeys + i); |
2094 | } | 2094 | } |
2095 | 2095 | ||
2096 | X509 * | ||
2097 | ssl_get_server_send_cert(const SSL *s) | ||
2098 | { | ||
2099 | CERT_PKEY *cpk; | ||
2100 | |||
2101 | cpk = ssl_get_server_send_pkey(s); | ||
2102 | if (!cpk) | ||
2103 | return (NULL); | ||
2104 | return (cpk->x509); | ||
2105 | } | ||
2106 | |||
2107 | EVP_PKEY * | 2096 | EVP_PKEY * |
2108 | ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *cipher, const EVP_MD **pmd, | 2097 | ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *cipher, const EVP_MD **pmd, |
2109 | const struct ssl_sigalg **sap) | 2098 | const struct ssl_sigalg **sap) |
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 5d39d1a391..9d06deeb7a 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.240 2019/03/25 16:35:48 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.241 2019/03/25 16:37:52 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 | * |
@@ -1117,7 +1117,6 @@ int ssl_undefined_function(SSL *s); | |||
1117 | int ssl_undefined_void_function(void); | 1117 | int ssl_undefined_void_function(void); |
1118 | int ssl_undefined_const_function(const SSL *s); | 1118 | int ssl_undefined_const_function(const SSL *s); |
1119 | CERT_PKEY *ssl_get_server_send_pkey(const SSL *s); | 1119 | CERT_PKEY *ssl_get_server_send_pkey(const SSL *s); |
1120 | X509 *ssl_get_server_send_cert(const SSL *); | ||
1121 | EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd, | 1120 | EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd, |
1122 | const struct ssl_sigalg **sap); | 1121 | const struct ssl_sigalg **sap); |
1123 | DH *ssl_get_auto_dh(SSL *s); | 1122 | DH *ssl_get_auto_dh(SSL *s); |