summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_cert.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
-rw-r--r--src/lib/libssl/ssl_cert.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index 917be31876..27256eea81 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -160,21 +160,6 @@ int SSL_get_ex_data_X509_STORE_CTX_idx(void)
160 return ssl_x509_store_ctx_idx; 160 return ssl_x509_store_ctx_idx;
161 } 161 }
162 162
163static void ssl_cert_set_default_md(CERT *cert)
164 {
165 /* Set digest values to defaults */
166#ifndef OPENSSL_NO_DSA
167 cert->pkeys[SSL_PKEY_DSA_SIGN].digest = EVP_dss1();
168#endif
169#ifndef OPENSSL_NO_RSA
170 cert->pkeys[SSL_PKEY_RSA_SIGN].digest = EVP_sha1();
171 cert->pkeys[SSL_PKEY_RSA_ENC].digest = EVP_sha1();
172#endif
173#ifndef OPENSSL_NO_ECDSA
174 cert->pkeys[SSL_PKEY_ECC].digest = EVP_ecdsa();
175#endif
176 }
177
178CERT *ssl_cert_new(void) 163CERT *ssl_cert_new(void)
179 { 164 {
180 CERT *ret; 165 CERT *ret;
@@ -189,7 +174,7 @@ CERT *ssl_cert_new(void)
189 174
190 ret->key= &(ret->pkeys[SSL_PKEY_RSA_ENC]); 175 ret->key= &(ret->pkeys[SSL_PKEY_RSA_ENC]);
191 ret->references=1; 176 ret->references=1;
192 ssl_cert_set_default_md(ret); 177
193 return(ret); 178 return(ret);
194 } 179 }
195 180
@@ -322,10 +307,6 @@ CERT *ssl_cert_dup(CERT *cert)
322 * chain is held inside SSL_CTX */ 307 * chain is held inside SSL_CTX */
323 308
324 ret->references=1; 309 ret->references=1;
325 /* Set digests to defaults. NB: we don't copy existing values as they
326 * will be set during handshake.
327 */
328 ssl_cert_set_default_md(ret);
329 310
330 return(ret); 311 return(ret);
331 312