Have all algorithm test programs call fips_algtest_init() at startup:

[openssl.git] / fips / rsa / fips_rsavtest.c

diff --git a/fips/rsa/fips_rsavtest.c b/fips/rsa/fips_rsavtest.c
index 0971f15fc02108b4ec9bb848c872eb722cbfb669..dbf73bee881223b8ef840da5d57ffcbbc89d0590 100644 (file)
--- a/fips/rsa/fips_rsavtest.c
+++ b/fips/rsa/fips_rsavtest.c
@@ -65,7 +65,6 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/err.h>
-#include <openssl/x509v3.h>
 #include <openssl/bn.h>
 
 #ifndef OPENSSL_FIPS
@@ -97,9 +96,7 @@ int main(int argc, char **argv)
        int ret = 1;
        int Saltlen = -1;
 
-       fips_set_error_print();
-       if(!FIPS_mode_set(1))
-               goto end;
+       fips_algtest_init();
 
        if ((argc > 2) && !strcmp("-saltlen", argv[1]))
                {
@@ -332,7 +329,7 @@ static int rsa_printver(FILE *out,
        if (!rsa_pubkey->n || !rsa_pubkey->e)
                goto error;
 
-       EVP_MD_CTX_init(&ctx);
+       FIPS_md_ctx_init(&ctx);
 
        if (Saltlen >= 0)
                pad_mode = RSA_PKCS1_PSS_PADDING;
@@ -341,9 +338,9 @@ static int rsa_printver(FILE *out,
        else
                pad_mode = RSA_PKCS1_PADDING;
 
-       if (!EVP_DigestInit_ex(&ctx, dgst, NULL))
+       if (!FIPS_digestinit(&ctx, dgst))
                goto error;
-       if (!EVP_DigestUpdate(&ctx, Msg, Msglen))
+       if (!FIPS_digestupdate(&ctx, Msg, Msglen))
                goto error;
 
        no_err = 1;
@@ -352,7 +349,7 @@ static int rsa_printver(FILE *out,
        no_err = 0;
 
 
-       EVP_MD_CTX_cleanup(&ctx);
+       FIPS_md_ctx_cleanup(&ctx);
 
        if (r < 0)
                goto error;