summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_clnt.c
diff options
context:
space:
mode:
authorjsing <>2022-02-03 16:33:12 +0000
committerjsing <>2022-02-03 16:33:12 +0000
commit1797a334a41f2408c221e936472024878d34d7c6 (patch)
treef898df6442fa1535bd54e575b63b8dd68b1983de /src/lib/libssl/ssl_clnt.c
parente0ca43dbb96b7050114088357efcbfa6b503c87f (diff)
downloadopenbsd-1797a334a41f2408c221e936472024878d34d7c6.tar.gz
openbsd-1797a334a41f2408c221e936472024878d34d7c6.tar.bz2
openbsd-1797a334a41f2408c221e936472024878d34d7c6.zip
Cleanup/simplify ssl_cert_type()
Remove the X509 argument as it is unused - this was passed so that ssl_cert_type() can get the public key from the X509 object if the EVP_PKEY argument is NULL, however this is never the case. ok tb@
Diffstat (limited to 'src/lib/libssl/ssl_clnt.c')
-rw-r--r--src/lib/libssl/ssl_clnt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index a402535c7d..6d50ade398 100644
--- a/src/lib/libssl/ssl_clnt.c
+++ b/src/lib/libssl/ssl_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_clnt.c,v 1.139 2022/01/24 13:53:29 tb Exp $ */ 1/* $OpenBSD: ssl_clnt.c,v 1.140 2022/02/03 16:33:12 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 *
@@ -1166,7 +1166,7 @@ ssl3_get_server_certificate(SSL *s)
1166 SSLerror(s, SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS); 1166 SSLerror(s, SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
1167 goto fatal_err; 1167 goto fatal_err;
1168 } 1168 }
1169 if ((cert_type = ssl_cert_type(x, pkey)) < 0) { 1169 if ((cert_type = ssl_cert_type(pkey)) < 0) {
1170 x = NULL; 1170 x = NULL;
1171 al = SSL3_AL_FATAL; 1171 al = SSL3_AL_FATAL;
1172 SSLerror(s, SSL_R_UNKNOWN_CERTIFICATE_TYPE); 1172 SSLerror(s, SSL_R_UNKNOWN_CERTIFICATE_TYPE);