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;
- fips_post_cb(FIPS_POST_END, 1, 0, NULL);
+ if (fips_post_cb)
+ fips_post_cb(FIPS_POST_END, 1, 0, NULL);
}
}
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_xts())
+ rv = 0;
if (!FIPS_selftest_des())
rv = 0;
if (!FIPS_selftest_rsa())
rv = 0;
if (!FIPS_selftest_dsa())
rv = 0;
+ if (!FIPS_selftest_ecdh())
+ rv = 0;
fips_post_end();
return rv;
}
const char *fail_str)
{
int subid;
- void *ex = NULL;
int ret = 0;
unsigned char *sig = NULL;
unsigned int siglen;
+ __fips_constseg
static const unsigned char str1[]="12345678901234567890";
DSA_SIG *dsig = NULL;
ECDSA_SIG *esig = NULL;
if (pkey == NULL)
{
ret = 1;
- /* Well actually sucess as we've set ret to 1 */
+ /* Well actually success as we've set ret to 1 */
goto error;
}
if (!FIPS_digestinit(&mctx, digest))
FIPSerr(FIPS_F_FIPS_PKEY_SIGNATURE_TEST,FIPS_R_TEST_FAILURE);
if (fail_str)
FIPS_add_error_data(2, "Type=", fail_str);
- fips_post_failed(id, subid, ex);
+ fips_post_failed(id, subid, pkey);
return 0;
}
return fips_post_success(id, subid, pkey);