diff options
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
-rw-r--r-- | src/lib/libssl/ssl_cert.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index ab76939116..6c00b0d336 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_cert.c,v 1.73 2019/03/25 16:24:57 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.74 2019/03/25 17:33:26 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 | * |
@@ -158,22 +158,6 @@ SSL_get_ex_data_X509_STORE_CTX_idx(void) | |||
158 | return ssl_x509_store_ctx_idx; | 158 | return ssl_x509_store_ctx_idx; |
159 | } | 159 | } |
160 | 160 | ||
161 | static void | ||
162 | ssl_cert_set_default_sigalgs(CERT *cert) | ||
163 | { | ||
164 | /* Set digest values to defaults */ | ||
165 | cert->pkeys[SSL_PKEY_RSA_SIGN].sigalg = | ||
166 | ssl_sigalg_lookup(SIGALG_RSA_PKCS1_SHA1); | ||
167 | cert->pkeys[SSL_PKEY_RSA_ENC].sigalg = | ||
168 | ssl_sigalg_lookup(SIGALG_RSA_PKCS1_SHA1); | ||
169 | cert->pkeys[SSL_PKEY_ECC].sigalg = | ||
170 | ssl_sigalg_lookup(SIGALG_ECDSA_SHA1); | ||
171 | #ifndef OPENSSL_NO_GOST | ||
172 | cert->pkeys[SSL_PKEY_GOST01].sigalg = | ||
173 | ssl_sigalg_lookup(SIGALG_GOSTR01_GOST94); | ||
174 | #endif | ||
175 | } | ||
176 | |||
177 | CERT * | 161 | CERT * |
178 | ssl_cert_new(void) | 162 | ssl_cert_new(void) |
179 | { | 163 | { |
@@ -186,7 +170,6 @@ ssl_cert_new(void) | |||
186 | } | 170 | } |
187 | ret->key = &(ret->pkeys[SSL_PKEY_RSA_ENC]); | 171 | ret->key = &(ret->pkeys[SSL_PKEY_RSA_ENC]); |
188 | ret->references = 1; | 172 | ret->references = 1; |
189 | ssl_cert_set_default_sigalgs(ret); | ||
190 | return (ret); | 173 | return (ret); |
191 | } | 174 | } |
192 | 175 | ||
@@ -289,11 +272,6 @@ ssl_cert_dup(CERT *cert) | |||
289 | */ | 272 | */ |
290 | 273 | ||
291 | ret->references = 1; | 274 | ret->references = 1; |
292 | /* | ||
293 | * Set sigalgs to defaults. NB: we don't copy existing values | ||
294 | * as they will be set during handshake. | ||
295 | */ | ||
296 | ssl_cert_set_default_sigalgs(ret); | ||
297 | 275 | ||
298 | return (ret); | 276 | return (ret); |
299 | 277 | ||