Remove unnecessary dependencies.

[openssl.git] / fips / dsa / fips_dsatest.c

diff --git a/fips/dsa/fips_dsatest.c b/fips/dsa/fips_dsatest.c
index 1bf6528962462efcffaea4c55ef543b404853407..678e089a428fe65d84107dc401a5f29f303766e5 100644 (file)
--- a/fips/dsa/fips_dsatest.c
+++ b/fips/dsa/fips_dsatest.c
@@ -71,10 +71,8 @@
 #include <openssl/rand.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
+#include <openssl/evp.h>
 #include <openssl/bn.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
 
 
 #if defined(OPENSSL_NO_DSA) || !defined(OPENSSL_FIPS)
@@ -156,7 +154,7 @@ int main(int argc, char **argv)
        BN_GENCB cb;
        EVP_MD_CTX mctx;
        BN_GENCB_set(&cb, dsa_cb, stderr);
-       EVP_MD_CTX_init(&mctx);
+       FIPS_md_ctx_init(&mctx);
 
        fips_set_error_print();
        if(!FIPS_mode_set(1))
@@ -212,17 +210,17 @@ int main(int argc, char **argv)
                }
        DSA_generate_key(dsa);
 
-       if (!EVP_DigestInit_ex(&mctx, EVP_sha1(), NULL))
+       if (!FIPS_digestinit(&mctx, EVP_sha1()))
                goto end;
-       if (!EVP_DigestUpdate(&mctx, str1, 20))
+       if (!FIPS_digestupdate(&mctx, str1, 20))
                goto end;
        sig = FIPS_dsa_sign_ctx(dsa, &mctx);
        if (!sig)
                goto end;
 
-       if (!EVP_DigestInit_ex(&mctx, EVP_sha1(), NULL))
+       if (!FIPS_digestinit(&mctx, EVP_sha1()))
                goto end;
-       if (!EVP_DigestUpdate(&mctx, str1, 20))
+       if (!FIPS_digestupdate(&mctx, str1, 20))
                goto end;
        if (FIPS_dsa_verify_ctx(dsa, &mctx, sig) != 1)
                goto end;
@@ -231,9 +229,9 @@ int main(int argc, char **argv)
 
 end:
        if (sig)
-               DSA_SIG_free(sig);
+               FIPS_dsa_sig_free(sig);
        if (dsa != NULL) FIPS_dsa_free(dsa);
-       EVP_MD_CTX_cleanup(&mctx);
+       FIPS_md_ctx_cleanup(&mctx);
 #if 0
        CRYPTO_mem_leaks(bio_err);
 #endif