diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-05-12 18:56:39 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-05-18 18:49:13 +0100 |
| commit | d376e57d6826e56f4c922806e088a111c52f9e92 (patch) | |
| tree | 777c49481bd4b5e4ef4aa3fa3a222ec297c2c4d1 /ssl/ssl_cert.c | |
| parent | 76106e60a827ddaefe1fee28a749018241d8f517 (diff) | |
Move signing digest out of CERT.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/ssl_cert.c')
| -rw-r--r-- | ssl/ssl_cert.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index fd7a9a60c1..45e2c021f8 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -165,21 +165,6 @@ int SSL_get_ex_data_X509_STORE_CTX_idx(void) return ssl_x509_store_ctx_idx; } -void ssl_cert_set_default_md(CERT *cert) -{ - /* Set digest values to defaults */ -#ifndef OPENSSL_NO_DSA - cert->pkeys[SSL_PKEY_DSA_SIGN].digest = EVP_sha1(); -#endif -#ifndef OPENSSL_NO_RSA - cert->pkeys[SSL_PKEY_RSA_SIGN].digest = EVP_sha1(); - cert->pkeys[SSL_PKEY_RSA_ENC].digest = EVP_sha1(); -#endif -#ifndef OPENSSL_NO_EC - cert->pkeys[SSL_PKEY_ECC].digest = EVP_sha1(); -#endif -} - CERT *ssl_cert_new(void) { CERT *ret = OPENSSL_malloc(sizeof(*ret)); @@ -192,7 +177,6 @@ CERT *ssl_cert_new(void) ret->key = &(ret->pkeys[SSL_PKEY_RSA_ENC]); ret->references = 1; - ssl_cert_set_default_md(ret); ret->sec_cb = ssl_security_default_callback; ret->sec_level = OPENSSL_TLS_SECURITY_LEVEL; ret->sec_ex = NULL; @@ -306,11 +290,6 @@ CERT *ssl_cert_dup(CERT *cert) } ret->references = 1; - /* - * Set digests to defaults. NB: we don't copy existing values as they - * will be set during handshake. - */ - ssl_cert_set_default_md(ret); /* Configured sigalgs copied across */ if (cert->conf_sigalgs) { ret->conf_sigalgs = OPENSSL_malloc(cert->conf_sigalgslen); |