diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2011-11-02 00:57:22 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2011-11-02 00:57:22 +0000 |
commit | 3ec9dceb15bfe2f45215e459454211fdc7a20c29 (patch) | |
tree | f64255d894ab0451d9c7ad03bbd64ec5951eb5fc /fips/rsa | |
parent | 92064785ec89b0c6c202b2a1356b18182ba750fa (diff) |
Add fips_algvs utility (from FIPS 2.0 stable branch).
Diffstat (limited to 'fips/rsa')
-rw-r--r-- | fips/rsa/fips_rsagtest.c | 4 | ||||
-rw-r--r-- | fips/rsa/fips_rsastest.c | 4 | ||||
-rw-r--r-- | fips/rsa/fips_rsavtest.c | 10 |
3 files changed, 15 insertions, 3 deletions
diff --git a/fips/rsa/fips_rsagtest.c b/fips/rsa/fips_rsagtest.c index 78b4531398..8342f615fb 100644 --- a/fips/rsa/fips_rsagtest.c +++ b/fips/rsa/fips_rsagtest.c @@ -88,7 +88,11 @@ static int rsa_printkey1(FILE *out, RSA *rsa, static int rsa_printkey2(FILE *out, RSA *rsa, BIGNUM *Xq1, BIGNUM *Xq2, BIGNUM *Xq); +#ifdef FIPS_ALGVS +int fips_rsagtest_main(int argc, char **argv) +#else int main(int argc, char **argv) +#endif { FILE *in = NULL, *out = NULL; diff --git a/fips/rsa/fips_rsastest.c b/fips/rsa/fips_rsastest.c index e0dbe2a0d7..d11b06316b 100644 --- a/fips/rsa/fips_rsastest.c +++ b/fips/rsa/fips_rsastest.c @@ -85,7 +85,11 @@ static int rsa_stest(FILE *out, FILE *in, int Saltlen); static int rsa_printsig(FILE *out, RSA *rsa, const EVP_MD *dgst, unsigned char *Msg, long Msglen, int Saltlen); +#ifdef FIPS_ALGVS +int fips_rsastest_main(int argc, char **argv) +#else int main(int argc, char **argv) +#endif { FILE *in = NULL, *out = NULL; diff --git a/fips/rsa/fips_rsavtest.c b/fips/rsa/fips_rsavtest.c index df33842691..7685c74ef0 100644 --- a/fips/rsa/fips_rsavtest.c +++ b/fips/rsa/fips_rsavtest.c @@ -82,14 +82,18 @@ int main(int argc, char *argv[]) #include "fips_utl.h" -int rsa_test(FILE *out, FILE *in, int saltlen); +int rsa_vtest(FILE *out, FILE *in, int saltlen); static int rsa_printver(FILE *out, BIGNUM *n, BIGNUM *e, const EVP_MD *dgst, unsigned char *Msg, long Msglen, unsigned char *S, long Slen, int Saltlen); +#ifdef FIPS_ALGVS +int fips_rsavtest_main(int argc, char **argv) +#else int main(int argc, char **argv) +#endif { FILE *in = NULL, *out = NULL; @@ -138,7 +142,7 @@ int main(int argc, char **argv) goto end; } - if (!rsa_test(out, in, Saltlen)) + if (!rsa_vtest(out, in, Saltlen)) { fprintf(stderr, "FATAL RSAVTEST file processing error\n"); goto end; @@ -159,7 +163,7 @@ int main(int argc, char **argv) #define RSA_TEST_MAXLINELEN 10240 -int rsa_test(FILE *out, FILE *in, int Saltlen) +int rsa_vtest(FILE *out, FILE *in, int Saltlen) { char *linebuf, *olinebuf, *p, *q; char *keyword, *value; |