Follow on from CVE-2014-3571. This fixes the code that was the original source

[oweals/openssl.git] / apps / dsaparam.c

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index e51f5026de84ba4f92458d2b697262ade9aa0ec0..a922335c3107331741f747fa5410238e7ebfbdc3 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -57,11 +57,6 @@
  */
 
 #include <openssl/opensslconf.h>       /* for OPENSSL_NO_DSA */
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
 
 #ifndef OPENSSL_NO_DSA
 #include <assert.h>
@@ -80,7 +75,8 @@
 #undef PROG
 #define PROG   dsaparam_main
 
-/* -inform arg - input format - default PEM (DER or PEM)
+/*-
+ * -inform arg - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg     - input file - default stdin
  * -out arg    - output file - default stdout
@@ -482,9 +478,6 @@ static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
        if (p == 3) c='\n';
        BIO_write(BN_GENCB_get_arg(cb),&c,1);
        (void)BIO_flush(BN_GENCB_get_arg(cb));
-#ifdef LINT
-       p=n;
-#endif
 #ifdef GENCB_TEST
        if(stop_keygen_flag)
                return 0;