diff options
| author |   jsing <jsing@openbsd.org> | 2019-03-25 17:33:26 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2019-03-25 17:33:26 +0000 |
| commit | 890365848576c7e95472b62c3f667138bdfa2bc4 (patch) | |
| tree | deca27e456ac89c67e388e0a101c5b7fb477121c /lib/libssl/ssl_cert.c | |
| parent | tls1_process_sigalgs() is no longer needed. (diff) | |
| download | wireguard-openbsd-890365848576c7e95472b62c3f667138bdfa2bc4.tar.xz wireguard-openbsd-890365848576c7e95472b62c3f667138bdfa2bc4.zip | |
Strip out all of the pkey to sigalg and sigalg to pkey linkages.
These are no longer used now that we defer signature algorithm selection.
ok beck@
Diffstat (limited to 'lib/libssl/ssl_cert.c')
| -rw-r--r-- | lib/libssl/ssl_cert.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/lib/libssl/ssl_cert.c b/lib/libssl/ssl_cert.c index ab76939116e..6c00b0d336f 100644 --- a/lib/libssl/ssl_cert.c +++ b/lib/libssl/ssl_cert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_cert.c,v 1.73 2019/03/25 16:24:57 jsing Exp $ */ +/* $OpenBSD: ssl_cert.c,v 1.74 2019/03/25 17:33:26 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -158,22 +158,6 @@ SSL_get_ex_data_X509_STORE_CTX_idx(void) return ssl_x509_store_ctx_idx; } -static void -ssl_cert_set_default_sigalgs(CERT *cert) -{ - /* Set digest values to defaults */ - cert->pkeys[SSL_PKEY_RSA_SIGN].sigalg = - ssl_sigalg_lookup(SIGALG_RSA_PKCS1_SHA1); - cert->pkeys[SSL_PKEY_RSA_ENC].sigalg = - ssl_sigalg_lookup(SIGALG_RSA_PKCS1_SHA1); - cert->pkeys[SSL_PKEY_ECC].sigalg = - ssl_sigalg_lookup(SIGALG_ECDSA_SHA1); -#ifndef OPENSSL_NO_GOST - cert->pkeys[SSL_PKEY_GOST01].sigalg = - ssl_sigalg_lookup(SIGALG_GOSTR01_GOST94); -#endif -} - CERT * ssl_cert_new(void) { @@ -186,7 +170,6 @@ ssl_cert_new(void) } ret->key = &(ret->pkeys[SSL_PKEY_RSA_ENC]); ret->references = 1; - ssl_cert_set_default_sigalgs(ret); return (ret); } @@ -289,11 +272,6 @@ ssl_cert_dup(CERT *cert) */ ret->references = 1; - /* - * Set sigalgs to defaults. NB: we don't copy existing values - * as they will be set during handshake. - */ - ssl_cert_set_default_sigalgs(ret); return (ret); |