Return error codes for selftest failure instead of hard assertion errors.

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

diff --git a/fips/rsa/fips_rsastest.c b/fips/rsa/fips_rsastest.c
index 9dff464a36bc880675aa8f25583cc11944b3176e..7a3dd31cbba6e3c2260a33d75c367cfde1096a89 100644 (file)
--- a/fips/rsa/fips_rsastest.c
+++ b/fips/rsa/fips_rsastest.c
@@ -66,7 +66,6 @@
 #include <openssl/hmac.h>
 #include <openssl/err.h>
 #include <openssl/bn.h>
-#include <openssl/x509v3.h>
 
 #ifndef OPENSSL_FIPS
 
@@ -92,9 +91,7 @@ int main(int argc, char **argv)
 
        int ret = 1, Saltlen = -1;
 
-       fips_set_error_print();
-       if(!FIPS_mode_set(1))
-               goto end;
+       fips_algtest_init();
 
        if ((argc > 2) && !strcmp("-saltlen", argv[1]))
                {
@@ -331,7 +328,7 @@ static int rsa_printsig(FILE *out, RSA *rsa, const EVP_MD *dgst,
        if (!sigbuf)
                goto error;
 
-       EVP_MD_CTX_init(&ctx);
+       FIPS_md_ctx_init(&ctx);
 
        if (Saltlen >= 0)
                pad_mode = RSA_PKCS1_PSS_PADDING;
@@ -340,15 +337,15 @@ static int rsa_printsig(FILE *out, RSA *rsa, const EVP_MD *dgst,
        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;
        if (!FIPS_rsa_sign_ctx(rsa, &ctx, pad_mode, Saltlen, NULL,
                                sigbuf, (unsigned int *)&siglen))
                goto error;
 
-       EVP_MD_CTX_cleanup(&ctx);
+       FIPS_md_ctx_cleanup(&ctx);
 
        fputs("S = ", out);