Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index 917be31876..5123a89182 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -164,14 +164,14 @@ static 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_dss1();
+        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_ECDSA
-        cert->pkeys[SSL_PKEY_ECC].digest = EVP_ecdsa();
+        cert->pkeys[SSL_PKEY_ECC].digest = EVP_sha1();
 #endif
         }