1 files changed, 11 insertions, 24 deletions

diff --git a/src/lib/libcrypto/dsa/dsa_depr.c b/src/lib/libcrypto/dsa/dsa_depr.c
index 8e3125b66f..50169ac9b2 100644
--- a/src/lib/libcrypto/dsa/dsa_depr.c
+++ b/src/lib/libcrypto/dsa/dsa_depr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_depr.c,v 1.3 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: dsa_depr.c,v 1.4 2014/07/09 10:16:24 miod Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -56,19 +56,6 @@
 /* This file contains deprecated function(s) that are now wrappers to the new
  * version(s). */
 
-#undef GENUINE_DSA
-
-#ifdef GENUINE_DSA
-/* Parameter generation follows the original release of FIPS PUB 186,
- * Appendix 2.2 (i.e. use SHA as defined in FIPS PUB 180) */
-#define HASH    EVP_sha()
-#else
-/* Parameter generation follows the updated Appendix 2.2 for FIPS PUB 186,
- * also Appendix 2.2 of FIPS PUB 186-1 (i.e. use SHA as defined in
- * FIPS PUB 180-1) */
-#define HASH    EVP_sha1()
-#endif 
-
 #ifndef OPENSSL_NO_SHA
 
 #include <stdio.h>
@@ -81,24 +68,24 @@
 #include <openssl/sha.h>
 
 #ifndef OPENSSL_NO_DEPRECATED
-DSA *DSA_generate_parameters(int bits,
-                unsigned char *seed_in, int seed_len,
-                int *counter_ret, unsigned long *h_ret,
-                void (*callback)(int, int, void *),
-                void *cb_arg)
-        {
+DSA *
+DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len,
+    int *counter_ret, unsigned long *h_ret, void (*callback)(int, int, void *),
+    void *cb_arg)
+{
         BN_GENCB cb;
         DSA *ret;
 
-        if ((ret=DSA_new()) == NULL) return NULL;
+        if ((ret = DSA_new()) == NULL)
+                return NULL;
 
         BN_GENCB_set_old(&cb, callback, cb_arg);
 
-        if(DSA_generate_parameters_ex(ret, bits, seed_in, seed_len,
-                                counter_ret, h_ret, &cb))
+        if (DSA_generate_parameters_ex(ret, bits, seed_in, seed_len,
+            counter_ret, h_ret, &cb))
                 return ret;
         DSA_free(ret);
         return NULL;
-        }
+}
 #endif
 #endif