Make `safe' (EC)DSA nonces the default.

[openssl.git] / crypto / dsa / dsa_sign.c

diff --git a/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c
index 6ac8e486e80ebe5bbb373f6eecb32e1291102cce..599093a4a86d647b9271060583d22e57fcd7fd2b 100644 (file)
--- a/crypto/dsa/dsa_sign.c
+++ b/crypto/dsa/dsa_sign.c
@@ -58,31 +58,19 @@
 
 /* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
 
+#define OPENSSL_FIPSAPI
+
 #include "cryptlib.h"
 #include <openssl/dsa.h>
+#include <openssl/rand.h>
+#include <openssl/bn.h>
 
 DSA_SIG * DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
        {
        return dsa->meth->dsa_do_sign(dgst, dlen, dsa);
        }
 
-int DSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char *sig,
-            unsigned int *siglen, DSA *dsa)
-       {
-       DSA_SIG *s;
-       s=DSA_do_sign(dgst,dlen,dsa);
-       if (s == NULL)
-               {
-               *siglen=0;
-               return(0);
-               }
-       *siglen=i2d_DSA_SIG(s,&sig);
-       DSA_SIG_free(s);
-       return(1);
-       }
-
 int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
        {
        return dsa->meth->dsa_sign_setup(dsa, ctx_in, kinvp, rp);
        }
-