diff options
author | jsing <> | 2022-02-03 16:33:12 +0000 |
---|---|---|
committer | jsing <> | 2022-02-03 16:33:12 +0000 |
commit | 8babe15310f777eda2ab1203f245c0f0892a3801 (patch) | |
tree | f898df6442fa1535bd54e575b63b8dd68b1983de /src/lib/libssl/ssl_locl.h | |
parent | 6fd933a66bac23ba01bf8727afa5da899721ffe0 (diff) | |
download | openbsd-8babe15310f777eda2ab1203f245c0f0892a3801.tar.gz openbsd-8babe15310f777eda2ab1203f245c0f0892a3801.tar.bz2 openbsd-8babe15310f777eda2ab1203f245c0f0892a3801.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_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 546854b462..ee64ec208e 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.383 2022/01/11 19:03:15 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.384 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 | * |
@@ -1310,7 +1310,7 @@ SSL_CERT_PKEY *ssl_get_server_send_pkey(const SSL *s); | |||
1310 | EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd, | 1310 | EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd, |
1311 | const struct ssl_sigalg **sap); | 1311 | const struct ssl_sigalg **sap); |
1312 | size_t ssl_dhe_params_auto_key_bits(SSL *s); | 1312 | size_t ssl_dhe_params_auto_key_bits(SSL *s); |
1313 | int ssl_cert_type(X509 *x, EVP_PKEY *pkey); | 1313 | int ssl_cert_type(EVP_PKEY *pkey); |
1314 | void ssl_set_cert_masks(SSL_CERT *c, const SSL_CIPHER *cipher); | 1314 | void ssl_set_cert_masks(SSL_CERT *c, const SSL_CIPHER *cipher); |
1315 | STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); | 1315 | STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); |
1316 | int ssl_has_ecc_ciphers(SSL *s); | 1316 | int ssl_has_ecc_ciphers(SSL *s); |