projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for DSA2 PQG generation of g parameter.
[openssl.git]
/
fips
/
fips_post.c
diff --git
a/fips/fips_post.c
b/fips/fips_post.c
index 1ab156fb3f4f9487c02400341542f6990263a0a9..286edfe64f2834038240180f3c5b7831af48fb68 100644
(file)
--- a/
fips/fips_post.c
+++ b/
fips/fips_post.c
@@
-105,12
+105,14
@@
void fips_post_end(void)
if (post_failure)
{
post_status = FIPS_POST_STATUS_FAILED;
if (post_failure)
{
post_status = FIPS_POST_STATUS_FAILED;
- fips_post_cb(FIPS_POST_END, 0, 0, NULL);
+ if(fips_post_cb)
+ fips_post_cb(FIPS_POST_END, 0, 0, NULL);
}
else
{
post_status = FIPS_POST_STATUS_OK;
}
else
{
post_status = FIPS_POST_STATUS_OK;
- fips_post_cb(FIPS_POST_END, 1, 0, NULL);
+ if (fips_post_cb)
+ fips_post_cb(FIPS_POST_END, 1, 0, NULL);
}
}
}
}
@@
-170,8
+172,12
@@
int FIPS_selftest(void)
rv = 0;
if (!FIPS_selftest_aes())
rv = 0;
rv = 0;
if (!FIPS_selftest_aes())
rv = 0;
+ if (!FIPS_selftest_aes_ccm())
+ rv = 0;
if (!FIPS_selftest_aes_gcm())
rv = 0;
if (!FIPS_selftest_aes_gcm())
rv = 0;
+ if (!FIPS_selftest_aes_xts())
+ rv = 0;
if (!FIPS_selftest_des())
rv = 0;
if (!FIPS_selftest_rsa())
if (!FIPS_selftest_des())
rv = 0;
if (!FIPS_selftest_rsa())