1 files changed, 22 insertions, 27 deletions

diff --git a/src/lib/libcrypto/dsa/dsa_utl.c b/src/lib/libcrypto/evp/c_all.c
index 24c021d120..766c4cecdf 100644
--- a/src/lib/libcrypto/dsa/dsa_utl.c
+++ b/src/lib/libcrypto/evp/c_all.c
@@ -1,4 +1,4 @@
-/* crypto/dsa/dsa_lib.c */
+/* crypto/evp/c_all.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,40 +56,35 @@
  * [including the GNU Public Licence.]
  */
 
-/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
-
 #include <stdio.h>
 #include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/asn1.h>
+#include <openssl/evp.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
 
-DSA_SIG *DSA_SIG_new(void)
+#if 0
+#undef OpenSSL_add_all_algorithms
+
+void OpenSSL_add_all_algorithms(void)
         {
-        DSA_SIG *sig;
-        sig = OPENSSL_malloc(sizeof(DSA_SIG));
-        if (!sig)
-                return NULL;
-        sig->r = NULL;
-        sig->s = NULL;
-        return sig;
+        OPENSSL_add_all_algorithms_noconf();
         }
+#endif
 
-void DSA_SIG_free(DSA_SIG *sig)
+void OPENSSL_add_all_algorithms_noconf(void)
         {
-        if (sig)
-                {
-                if (sig->r)
-                        BN_free(sig->r);
-                if (sig->s)
-                        BN_free(sig->s);
-                OPENSSL_free(sig);
-                }
+        /*
+         * For the moment OPENSSL_cpuid_setup does something
+         * only on IA-32, but we reserve the option for all
+         * platforms...
+         */
+        OPENSSL_cpuid_setup();
+        OpenSSL_add_all_ciphers();
+        OpenSSL_add_all_digests();
+#ifndef OPENSSL_NO_ENGINE
+# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
+        ENGINE_setup_bsd_cryptodev();
+# endif
+#endif
         }
-