*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <openssl/rand.h>
#include <openssl/fips_rand.h>
static int fips_selftest_fail;
static int fips_mode;
+static int fips_started = 0;
static const void *fips_rand_check;
+static int fips_is_owning_thread(void);
+static int fips_set_owning_thread(void);
+static int fips_clear_owning_thread(void);
+static unsigned char *fips_signature_witness(void);
+
+static void fips_w_lock(void) { CRYPTO_w_lock(CRYPTO_LOCK_FIPS); }
+static void fips_w_unlock(void) { CRYPTO_w_unlock(CRYPTO_LOCK_FIPS); }
+static void fips_r_lock(void) { CRYPTO_r_lock(CRYPTO_LOCK_FIPS); }
+static void fips_r_unlock(void) { CRYPTO_r_unlock(CRYPTO_LOCK_FIPS); }
+
static void fips_set_mode(int onoff)
{
int owning_thread = fips_is_owning_thread();
- if (fips_is_started())
+ if (fips_started)
{
if (!owning_thread) fips_w_lock();
fips_mode = onoff;
{
int owning_thread = fips_is_owning_thread();
- if (fips_is_started())
+ if (fips_started)
{
if (!owning_thread) fips_w_lock();
fips_rand_check = rand_check;
int ret = 0;
int owning_thread = fips_is_owning_thread();
- if (fips_is_started())
+ if (fips_started)
{
if (!owning_thread) fips_r_lock();
ret = fips_mode;
const void *ret = 0;
int owning_thread = fips_is_owning_thread();
- if (fips_is_started())
+ if (fips_started)
{
if (!owning_thread) fips_r_lock();
ret = fips_rand_check;
int FIPS_selftest_failed(void)
{
int ret = 0;
- if (fips_is_started())
+ if (fips_started)
{
int owning_thread = fips_is_owning_thread();
int ret = 0;
fips_w_lock();
- fips_set_started();
+ fips_started = 1;
fips_set_owning_thread();
if(onoff)
return ret;
}
-void fips_w_lock(void) { CRYPTO_w_lock(CRYPTO_LOCK_FIPS); }
-void fips_w_unlock(void) { CRYPTO_w_unlock(CRYPTO_LOCK_FIPS); }
-void fips_r_lock(void) { CRYPTO_r_lock(CRYPTO_LOCK_FIPS); }
-void fips_r_unlock(void) { CRYPTO_r_unlock(CRYPTO_LOCK_FIPS); }
-
-static int fips_started = 0;
static CRYPTO_THREADID fips_thread;
static int fips_thread_set = 0;
-void fips_set_started(void)
- {
- fips_started = 1;
- }
-
-int fips_is_started(void)
- {
- return fips_started;
- }
-
-int fips_is_owning_thread(void)
+static int fips_is_owning_thread(void)
{
int ret = 0;
- if (fips_is_started())
+ if (fips_started)
{
CRYPTO_r_lock(CRYPTO_LOCK_FIPS2);
if (fips_thread_set)
{
int ret = 0;
- if (fips_is_started())
+ if (fips_started)
{
CRYPTO_w_lock(CRYPTO_LOCK_FIPS2);
if (!fips_thread_set)
{
int ret = 0;
- if (fips_is_started())
+ if (fips_started)
{
CRYPTO_w_lock(CRYPTO_LOCK_FIPS2);
if (fips_thread_set)
unsigned int siglen;
DSA_SIG *dsig = NULL;
EVP_MD_CTX mctx;
- EVP_MD_CTX_init(&mctx);
+ FIPS_md_ctx_init(&mctx);
if ((pkey->type == EVP_PKEY_RSA)
&& ((size_t)RSA_size(pkey->pkey.rsa) > sizeof(sigtmp)))
if (tbslen == -1)
tbslen = strlen((char *)tbs);
- if (!EVP_DigestInit_ex(&mctx, digest, NULL))
+ if (!FIPS_digestinit(&mctx, digest))
goto error;
- if (!EVP_DigestUpdate(&mctx, tbs, tbslen))
+ if (!FIPS_digestupdate(&mctx, tbs, tbslen))
goto error;
if (pkey->type == EVP_PKEY_RSA)
{
if (kat && ((siglen != katlen) || memcmp(kat, sig, katlen)))
goto error;
- if (!EVP_DigestInit_ex(&mctx, digest, NULL))
+ if (!FIPS_digestinit(&mctx, digest))
goto error;
- if (!EVP_DigestUpdate(&mctx, tbs, tbslen))
+ if (!FIPS_digestupdate(&mctx, tbs, tbslen))
goto error;
if (pkey->type == EVP_PKEY_RSA)
{
DSA_SIG_free(dsig);
if (sig != sigtmp)
OPENSSL_free(sig);
- EVP_MD_CTX_cleanup(&mctx);
+ FIPS_md_ctx_cleanup(&mctx);
if (ret != 1)
{
FIPSerr(FIPS_F_FIPS_PKEY_SIGNATURE_TEST,FIPS_R_TEST_FAILURE);
if (fail_str)
- ERR_add_error_data(2, "Type=", fail_str);
+ FIPS_add_error_data(2, "Type=", fail_str);
return 0;
}
return 1;
unsigned char pltmp[FIPS_MAX_CIPHER_TEST_SIZE];
unsigned char citmp[FIPS_MAX_CIPHER_TEST_SIZE];
OPENSSL_assert(len <= FIPS_MAX_CIPHER_TEST_SIZE);
- if (EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, 1) <= 0)
+ if (FIPS_cipherinit(ctx, cipher, key, iv, 1) <= 0)
return 0;
- EVP_Cipher(ctx, citmp, plaintext, len);
+ FIPS_cipher(ctx, citmp, plaintext, len);
if (memcmp(citmp, ciphertext, len))
return 0;
- if (EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, 0) <= 0)
+ if (FIPS_cipherinit(ctx, cipher, key, iv, 0) <= 0)
return 0;
- EVP_Cipher(ctx, pltmp, citmp, len);
+ FIPS_cipher(ctx, pltmp, citmp, len);
if (memcmp(pltmp, plaintext, len))
return 0;
return 1;