/*
- * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
#include "internal/cryptlib.h"
#include "internal/property.h"
#include "internal/nelem.h"
+#include "openssl/param_build.h"
#include "crypto/evp.h"
#include "prov/implementations.h"
#include "prov/provider_ctx.h"
#include "prov/providercommon.h"
#include "prov/provider_util.h"
-#include "selftest.h"
+#include "self_test.h"
-#define ALGC(NAMES, FUNC, CHECK) { { NAMES, "fips=yes", FUNC }, CHECK }
+/*
+ * Forward declarations to ensure that interface functions are correctly
+ * defined.
+ */
+static OSSL_provider_teardown_fn fips_teardown;
+static OSSL_provider_gettable_params_fn fips_gettable_params;
+static OSSL_provider_get_params_fn fips_get_params;
+static OSSL_provider_query_operation_fn fips_query;
+
+#define ALGC(NAMES, FUNC, CHECK) { { NAMES, "provider=fips,fips=yes", FUNC }, CHECK }
#define ALG(NAMES, FUNC) ALGC(NAMES, FUNC, NULL)
extern OSSL_core_thread_start_fn *c_thread_start;
static OSSL_core_new_error_fn *c_new_error;
static OSSL_core_set_error_debug_fn *c_set_error_debug;
static OSSL_core_vset_error_fn *c_vset_error;
+static OSSL_core_set_error_mark_fn *c_set_error_mark;
+static OSSL_core_clear_last_error_mark_fn *c_clear_last_error_mark;
+static OSSL_core_pop_error_to_mark_fn *c_pop_error_to_mark;
static OSSL_CRYPTO_malloc_fn *c_CRYPTO_malloc;
static OSSL_CRYPTO_zalloc_fn *c_CRYPTO_zalloc;
static OSSL_CRYPTO_free_fn *c_CRYPTO_free;
static OSSL_CRYPTO_secure_free_fn *c_CRYPTO_secure_free;
static OSSL_CRYPTO_secure_clear_free_fn *c_CRYPTO_secure_clear_free;
static OSSL_CRYPTO_secure_allocated_fn *c_CRYPTO_secure_allocated;
+static OSSL_BIO_vsnprintf_fn *c_BIO_vsnprintf;
typedef struct fips_global_st {
- const OSSL_PROVIDER *prov;
+ const OSSL_CORE_HANDLE *handle;
} FIPS_GLOBAL;
static void *fips_prov_ossl_ctx_new(OPENSSL_CTX *libctx)
/*
* Parameters to retrieve from the core provider - required for self testing.
* NOTE: inside core_get_params() these will be loaded from config items
- * stored inside prov->parameters (except for OSSL_PROV_PARAM_MODULE_FILENAME).
+ * stored inside prov->parameters (except for
+ * OSSL_PROV_PARAM_CORE_MODULE_FILENAME).
*/
static OSSL_PARAM core_params[] =
{
- OSSL_PARAM_utf8_ptr(OSSL_PROV_PARAM_MODULE_FILENAME,
+ OSSL_PARAM_utf8_ptr(OSSL_PROV_PARAM_CORE_MODULE_FILENAME,
selftest_params.module_filename,
sizeof(selftest_params.module_filename)),
OSSL_PARAM_utf8_ptr(OSSL_PROV_FIPS_PARAM_MODULE_MAC,
OSSL_PARAM_END
};
-/*
- * This routine is currently necessary as bn params are currently processed
- * using BN_native2bn when raw data is received. This means we need to do
- * magic to reverse the order of the bytes to match native format.
- * The array of hexdata is to get around compilers that dont like
- * strings longer than 509 bytes,
- */
-static int rawnative_fromhex(const char *hex_data[],
- unsigned char **native, size_t *nativelen)
-{
- int ret = 0;
- unsigned char *data = NULL;
- BIGNUM *bn = NULL;
- int i, slen, datalen, sz;
- char *str = NULL;
-
- for (slen = 0, i = 0; hex_data[i] != NULL; ++i)
- slen += strlen(hex_data[i]);
- str = OPENSSL_zalloc(slen + 1);
- if (str == NULL)
- return 0;
- for (i = 0; hex_data[i] != NULL; ++i)
- strcat(str, hex_data[i]);
-
- if (BN_hex2bn(&bn, str) <= 0)
- return 0;
-
- datalen = slen / 2;
- data = (unsigned char *)str; /* reuse the str buffer */
-
- sz = BN_bn2nativepad(bn, data, datalen);
- if (sz <= 0)
- goto err;
- ret = 1;
- *native = data;
- *nativelen = datalen;
- data = NULL; /* so it does not get freed */
-err:
- BN_free(bn);
- OPENSSL_free(data);
- return ret;
-}
-
/* TODO(3.0): To be removed */
-static int dummy_evp_call(void *provctx)
+static int dummy_evp_call(OPENSSL_CTX *libctx)
{
- OPENSSL_CTX *libctx = PROV_LIBRARY_CONTEXT_OF(provctx);
EVP_MD_CTX *ctx = EVP_MD_CTX_new();
EVP_MD *sha256 = EVP_MD_fetch(libctx, "SHA256", NULL);
EVP_KDF *kdf = EVP_KDF_fetch(libctx, OSSL_KDF_NAME_PBKDF2, NULL);
- EVP_PKEY_CTX *sctx = NULL, *kctx = NULL;
- EVP_PKEY *pkey = NULL;
- OSSL_PARAM *p;
- OSSL_PARAM params[16];
- unsigned char sig[64];
- size_t siglen, sigdgstlen;
- unsigned char *dsa_p = NULL, *dsa_q = NULL, *dsa_g = NULL;
- unsigned char *dsa_pub = NULL, *dsa_priv = NULL;
- size_t dsa_p_len, dsa_q_len, dsa_g_len, dsa_pub_len, dsa_priv_len;
-
- /* dsa 2048 */
- static const char *dsa_p_hex[] = {
- "a29b8872ce8b8423b7d5d21d4b02f57e03e9e6b8a258dc16611ba098ab543415"
- "e415f156997a3ee236658fa093260de3ad422e05e046f9ec29161a375f0eb4ef"
- "fcef58285c5d39ed425d7a62ca12896c4a92cb1946f2952a48133f07da364d1b"
- "df6b0f7139983e693c80059b0eacd1479ba9f2857754ede75f112b07ebbf3534",
- "8bbf3e01e02f2d473de39453f99dd2367541caca3ba01166343d7b5b58a37bd1"
- "b7521db2f13b86707132fe09f4cd09dc1618fa3401ebf9cc7b19fa94aa472088"
- "133d6cb2d35c1179c8c8ff368758d507d9f9a17d46c110fe3144ce9b022b42e4"
- "19eb4f5388613bfc3e26241a432e8706bc58ef76117278deab6cf692618291b7",
- NULL
- };
- static const char *dsa_q_hex[] = {
- "a3bfd9ab7884794e383450d5891dc18b65157bdcfcdac51518902867",
- NULL
- };
- static const char *dsa_g_hex[] = {
- "6819278869c7fd3d2d7b77f77e8150d9ad433bea3ba85efc80415aa3545f78f7"
- "2296f06cb19ceda06c94b0551cfe6e6f863e31d1de6eed7dab8b0c9df231e084"
- "34d1184f91d033696bb382f8455e9888f5d31d4784ec40120246f4bea61794bb"
- "a5866f09746463bdf8e9e108cd9529c3d0f6df80316e2e70aaeb1b26cdb8ad97",
- "bc3d287e0b8d616c42e65b87db20deb7005bc416747a6470147a68a7820388eb"
- "f44d52e0628af9cf1b7166d03465f35acc31b6110c43dabc7c5d591e671eaf7c"
- "252c1c145336a1a4ddf13244d55e835680cab2533b82df2efe55ec18c1e6cd00"
- "7bb089758bb17c2cbe14441bd093ae66e5976d53733f4fa3269701d31d23d467",
- NULL
- };
- static const char *dsa_pub_hex[] = {
- "a012b3b170b307227957b7ca2061a816ac7a2b3d9ae995a5119c385b603bf6f6"
- "c5de4dc5ecb5dfa4a41c68662eb25b638b7e2620ba898d07da6c4991e76cc0ec"
- "d1ad3421077067e47c18f58a92a72ad43199ecb7bd84e7d3afb9019f0e9dd0fb"
- "aa487300b13081e33c902876436f7b03c345528481d362815e24fe59dac5ac34",
- "660d4c8a76cb99a7c7de93eb956cd6bc88e58d901034944a094b01803a43c672"
- "b9688c0e01d8f4fc91c62a3f88021f7bd6a651b1a88f43aa4ef27653d12bf8b7"
- "099fdf6b461082f8e939107bfd2f7210087d326c375200f1f51e7e74a3413190"
- "1bcd0863521ff8d676c48581868736c5e51b16a4e39215ea0b17c4735974c516",
- NULL
- };
- static const char *dsa_priv_hex[] = {
- "6ccaeef6d73b4e80f11c17b8e9627c036635bac39423505e407e5cb7",
- NULL
- };
- char msg[] = "Hello World!";
- const unsigned char exptd[] = {
- 0x7f, 0x83, 0xb1, 0x65, 0x7f, 0xf1, 0xfc, 0x53, 0xb9, 0x2d, 0xc1, 0x81,
- 0x48, 0xa1, 0xd6, 0x5d, 0xfc, 0x2d, 0x4b, 0x1f, 0xa3, 0xd6, 0x77, 0x28,
- 0x4a, 0xdd, 0xd2, 0x00, 0x12, 0x6d, 0x90, 0x69
- };
- unsigned int dgstlen = 0;
unsigned char dgst[SHA256_DIGEST_LENGTH];
+ unsigned int dgstlen;
int ret = 0;
BN_CTX *bnctx = NULL;
BIGNUM *a = NULL, *b = NULL;
EC_KEY *key = NULL;
#endif
+ static const char msg[] = "Hello World!";
+ static const unsigned char exptd[] = {
+ 0x7f, 0x83, 0xb1, 0x65, 0x7f, 0xf1, 0xfc, 0x53, 0xb9, 0x2d, 0xc1, 0x81,
+ 0x48, 0xa1, 0xd6, 0x5d, 0xfc, 0x2d, 0x4b, 0x1f, 0xa3, 0xd6, 0x77, 0x28,
+ 0x4a, 0xdd, 0xd2, 0x00, 0x12, 0x6d, 0x90, 0x69
+ };
+
if (ctx == NULL || sha256 == NULL || drbg == NULL || kdf == NULL)
goto err;
if (!EC_KEY_generate_key(key))
goto err;
#endif
- if (!rawnative_fromhex(dsa_p_hex, &dsa_p, &dsa_p_len)
- || !rawnative_fromhex(dsa_q_hex, &dsa_q, &dsa_q_len)
- || !rawnative_fromhex(dsa_g_hex, &dsa_g, &dsa_g_len)
- || !rawnative_fromhex(dsa_pub_hex, &dsa_pub, &dsa_pub_len)
- || !rawnative_fromhex(dsa_priv_hex, &dsa_priv, &dsa_priv_len))
- goto err;
-
- p = params;
- *p++ = OSSL_PARAM_construct_BN(OSSL_PKEY_PARAM_FFC_P, dsa_p, dsa_p_len);
- *p++ = OSSL_PARAM_construct_BN(OSSL_PKEY_PARAM_FFC_Q, dsa_q, dsa_q_len);
- *p++ = OSSL_PARAM_construct_BN(OSSL_PKEY_PARAM_FFC_G, dsa_g, dsa_g_len);
- *p++ = OSSL_PARAM_construct_BN(OSSL_PKEY_PARAM_DSA_PUB_KEY,
- dsa_pub, dsa_pub_len);
- *p++ = OSSL_PARAM_construct_BN(OSSL_PKEY_PARAM_DSA_PRIV_KEY,
- dsa_priv, dsa_priv_len);
- *p = OSSL_PARAM_construct_end();
-
- kctx = EVP_PKEY_CTX_new_from_name(libctx, SN_dsa, "");
- if (kctx == NULL)
- goto err;
- if (EVP_PKEY_key_fromdata_init(kctx) <= 0
- || EVP_PKEY_fromdata(kctx, &pkey, params) <= 0)
- goto err;
-
- sctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey);
- if (sctx == NULL)
- goto err;;
- if (EVP_PKEY_sign_init(sctx) <= 0)
- goto err;
-
- /* set signature parameters */
- sigdgstlen = SHA256_DIGEST_LENGTH;
- p = params;
- *p++ = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_DIGEST,
- SN_sha256,
- strlen(SN_sha256) + 1);
-
- *p++ = OSSL_PARAM_construct_size_t(OSSL_SIGNATURE_PARAM_DIGEST_SIZE,
- &sigdgstlen);
- *p = OSSL_PARAM_construct_end();
- if (EVP_PKEY_CTX_set_params(sctx, params) <= 0)
- goto err;
-
- if (EVP_PKEY_sign(sctx, sig, &siglen, dgst, sizeof(dgst)) <= 0
- || EVP_PKEY_verify_init(sctx) <= 0
- || EVP_PKEY_verify(sctx, sig, siglen, dgst, sizeof(dgst)) <= 0)
- goto err;
ret = 1;
err:
BN_CTX_end(bnctx);
#ifndef OPENSSL_NO_EC
EC_KEY_free(key);
#endif
- OPENSSL_free(dsa_p);
- OPENSSL_free(dsa_q);
- OPENSSL_free(dsa_g);
- OPENSSL_free(dsa_pub);
- OPENSSL_free(dsa_priv);
- EVP_PKEY_free(pkey);
- EVP_PKEY_CTX_free(kctx);
- EVP_PKEY_CTX_free(sctx);
return ret;
}
-static const OSSL_PARAM *fips_gettable_params(const OSSL_PROVIDER *prov)
+static const OSSL_PARAM *fips_gettable_params(void *provctx)
{
return fips_param_types;
}
-static int fips_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[])
+static int fips_get_params(void *provctx, OSSL_PARAM params[])
{
OSSL_PARAM *p;
/* FIPS specific version of the function of the same name in provlib.c */
const char *ossl_prov_util_nid_to_name(int nid)
{
- /* We don't have OBJ_nid2n() in FIPS_MODE so we have an explicit list */
+ /* We don't have OBJ_nid2n() in FIPS_MODULE so we have an explicit list */
switch (nid) {
/* Digests */
*/
static const OSSL_ALGORITHM fips_digests[] = {
/* Our primary name:NiST name[:our older names] */
- { "SHA1:SHA-1", "fips=yes", sha1_functions },
- { "SHA2-224:SHA-224:SHA224", "fips=yes", sha224_functions },
- { "SHA2-256:SHA-256:SHA256", "fips=yes", sha256_functions },
- { "SHA2-384:SHA-384:SHA384", "fips=yes", sha384_functions },
- { "SHA2-512:SHA-512:SHA512", "fips=yes", sha512_functions },
- { "SHA2-512/224:SHA-512/224:SHA512-224", "fips=yes",
+ { "SHA1:SHA-1", "provider=fips,fips=yes", sha1_functions },
+ { "SHA2-224:SHA-224:SHA224", "provider=fips,fips=yes", sha224_functions },
+ { "SHA2-256:SHA-256:SHA256", "provider=fips,fips=yes", sha256_functions },
+ { "SHA2-384:SHA-384:SHA384", "provider=fips,fips=yes", sha384_functions },
+ { "SHA2-512:SHA-512:SHA512", "provider=fips,fips=yes", sha512_functions },
+ { "SHA2-512/224:SHA-512/224:SHA512-224", "provider=fips,fips=yes",
sha512_224_functions },
- { "SHA2-512/256:SHA-512/256:SHA512-256", "fips=yes",
+ { "SHA2-512/256:SHA-512/256:SHA512-256", "provider=fips,fips=yes",
sha512_256_functions },
/* We agree with NIST here, so one name only */
- { "SHA3-224", "fips=yes", sha3_224_functions },
- { "SHA3-256", "fips=yes", sha3_256_functions },
- { "SHA3-384", "fips=yes", sha3_384_functions },
- { "SHA3-512", "fips=yes", sha3_512_functions },
+ { "SHA3-224", "provider=fips,fips=yes", sha3_224_functions },
+ { "SHA3-256", "provider=fips,fips=yes", sha3_256_functions },
+ { "SHA3-384", "provider=fips,fips=yes", sha3_384_functions },
+ { "SHA3-512", "provider=fips,fips=yes", sha3_512_functions },
+
+ { "SHAKE-128:SHAKE128", "provider=fips,fips=yes", shake_128_functions },
+ { "SHAKE-256:SHAKE256", "provider=fips,fips=yes", shake_256_functions },
+
/*
* KECCAK-KMAC-128 and KECCAK-KMAC-256 as hashes are mostly useful for
* KMAC128 and KMAC256.
*/
- { "KECCAK-KMAC-128:KECCAK-KMAC128", "fips=yes", keccak_kmac_128_functions },
- { "KECCAK-KMAC-256:KECCAK-KMAC256", "fips=yes", keccak_kmac_256_functions },
-
+ { "KECCAK-KMAC-128:KECCAK-KMAC128", "provider=fips,fips=yes",
+ keccak_kmac_128_functions },
+ { "KECCAK-KMAC-256:KECCAK-KMAC256", "provider=fips,fips=yes",
+ keccak_kmac_256_functions },
{ NULL, NULL, NULL }
};
ALG("AES-256-CBC", aes256cbc_functions),
ALG("AES-192-CBC", aes192cbc_functions),
ALG("AES-128-CBC", aes128cbc_functions),
+ ALG("AES-256-OFB", aes256ofb_functions),
+ ALG("AES-192-OFB", aes192ofb_functions),
+ ALG("AES-128-OFB", aes128ofb_functions),
+ ALG("AES-256-CFB", aes256cfb_functions),
+ ALG("AES-192-CFB", aes192cfb_functions),
+ ALG("AES-128-CFB", aes128cfb_functions),
+ ALG("AES-256-CFB1", aes256cfb1_functions),
+ ALG("AES-192-CFB1", aes192cfb1_functions),
+ ALG("AES-128-CFB1", aes128cfb1_functions),
+ ALG("AES-256-CFB8", aes256cfb8_functions),
+ ALG("AES-192-CFB8", aes192cfb8_functions),
+ ALG("AES-128-CFB8", aes128cfb8_functions),
ALG("AES-256-CTR", aes256ctr_functions),
ALG("AES-192-CTR", aes192ctr_functions),
ALG("AES-128-CTR", aes128ctr_functions),
static const OSSL_ALGORITHM fips_macs[] = {
#ifndef OPENSSL_NO_CMAC
- { "CMAC", "fips=yes", cmac_functions },
+ { "CMAC", "provider=fips,fips=yes", cmac_functions },
#endif
- { "GMAC", "fips=yes", gmac_functions },
- { "HMAC", "fips=yes", hmac_functions },
- { "KMAC-128:KMAC128", "fips=yes", kmac128_functions },
- { "KMAC-256:KMAC256", "fips=yes", kmac256_functions },
+ { "GMAC", "provider=fips,fips=yes", gmac_functions },
+ { "HMAC", "provider=fips,fips=yes", hmac_functions },
+ { "KMAC-128:KMAC128", "provider=fips,fips=yes", kmac128_functions },
+ { "KMAC-256:KMAC256", "provider=fips,fips=yes", kmac256_functions },
{ NULL, NULL, NULL }
};
static const OSSL_ALGORITHM fips_kdfs[] = {
- { "HKDF", "fips=yes", kdf_hkdf_functions },
- { "SSKDF", "fips=yes", kdf_sskdf_functions },
- { "PBKDF2", "fips=yes", kdf_pbkdf2_functions },
- { "TLS1-PRF", "fips=yes", kdf_tls1_prf_functions },
- { "KBKDF", "fips=yes", kdf_kbkdf_functions },
+ { "HKDF", "provider=fips,fips=yes", kdf_hkdf_functions },
+ { "SSKDF", "provider=fips,fips=yes", kdf_sskdf_functions },
+ { "PBKDF2", "provider=fips,fips=yes", kdf_pbkdf2_functions },
+ { "SSHKDF", "provider=fips,fips=yes", kdf_sshkdf_functions },
+ { "X963KDF", "provider=fips,fips=yes", kdf_x963_kdf_functions },
+ { "TLS1-PRF", "provider=fips,fips=yes", kdf_tls1_prf_functions },
+ { "KBKDF", "provider=fips,fips=yes", kdf_kbkdf_functions },
+ { NULL, NULL, NULL }
+};
+
+static const OSSL_ALGORITHM fips_keyexch[] = {
+#ifndef OPENSSL_NO_DH
+ { "DH:dhKeyAgreement", "provider=fips,fips=yes", dh_keyexch_functions },
+#endif
+#ifndef OPENSSL_NO_EC
+ { "ECDH", "provider=fips,fips=yes", ecdh_keyexch_functions },
+ { "X25519", "provider=fips,fips=no", x25519_keyexch_functions },
+ { "X448", "provider=fips,fips=no", x448_keyexch_functions },
+#endif
{ NULL, NULL, NULL }
};
static const OSSL_ALGORITHM fips_signature[] = {
#ifndef OPENSSL_NO_DSA
- { "DSA:dsaEncryption", "fips=yes", dsa_signature_functions },
+ { "DSA:dsaEncryption", "provider=fips,fips=yes", dsa_signature_functions },
+#endif
+ { "RSA:rsaEncryption", "provider=fips,fips=yes", rsa_signature_functions },
+#ifndef OPENSSL_NO_EC
+ { "ED25519", "provider=fips,fips=no", ed25519_signature_functions },
+ { "ED448", "provider=fips,fips=no", ed448_signature_functions },
+ { "ECDSA", "provider=fips,fips=yes", ecdsa_signature_functions },
#endif
{ NULL, NULL, NULL }
};
+static const OSSL_ALGORITHM fips_asym_cipher[] = {
+ { "RSA:rsaEncryption", "provider=fips,fips=yes", rsa_asym_cipher_functions },
+ { NULL, NULL, NULL }
+};
+
static const OSSL_ALGORITHM fips_keymgmt[] = {
+#ifndef OPENSSL_NO_DH
+ { "DH:dhKeyAgreement", "provider=fips,fips=yes", dh_keymgmt_functions },
+#endif
#ifndef OPENSSL_NO_DSA
- { "DSA", "fips=yes", dsa_keymgmt_functions },
+ { "DSA", "provider=fips,fips=yes", dsa_keymgmt_functions },
+#endif
+ { "RSA:rsaEncryption", "provider=fips,fips=yes", rsa_keymgmt_functions },
+ { "RSA-PSS:RSASSA-PSS", "provider=fips,fips=yes",
+ rsapss_keymgmt_functions },
+#ifndef OPENSSL_NO_EC
+ { "EC:id-ecPublicKey", "provider=fips,fips=yes", ec_keymgmt_functions },
+ { "X25519", "provider=fips,fips=no", x25519_keymgmt_functions },
+ { "X448", "provider=fips,fips=no", x448_keymgmt_functions },
+ { "ED25519", "provider=fips,fips=no", ed25519_keymgmt_functions },
+ { "ED448", "provider=fips,fips=no", ed448_keymgmt_functions },
#endif
{ NULL, NULL, NULL }
};
-static const OSSL_ALGORITHM *fips_query(OSSL_PROVIDER *prov,
- int operation_id,
- int *no_cache)
+static const OSSL_ALGORITHM *fips_query(void *provctx, int operation_id,
+ int *no_cache)
{
*no_cache = 0;
switch (operation_id) {
return fips_kdfs;
case OSSL_OP_KEYMGMT:
return fips_keymgmt;
+ case OSSL_OP_KEYEXCH:
+ return fips_keyexch;
case OSSL_OP_SIGNATURE:
return fips_signature;
+ case OSSL_OP_ASYM_CIPHER:
+ return fips_asym_cipher;
}
return NULL;
}
-/* Functions we provide to the core */
-static const OSSL_DISPATCH fips_dispatch_table[] = {
+static void fips_teardown(void *provctx)
+{
+ OPENSSL_CTX_free(PROV_LIBRARY_CONTEXT_OF(provctx));
+ PROV_CTX_free(provctx);
+}
+
+static void fips_intern_teardown(void *provctx)
+{
/*
- * To release our resources we just need to free the OPENSSL_CTX so we just
- * use OPENSSL_CTX_free directly as our teardown function
+ * We know that the library context is the same as for the outer provider,
+ * so no need to destroy it here.
*/
- { OSSL_FUNC_PROVIDER_TEARDOWN, (void (*)(void))OPENSSL_CTX_free },
+ PROV_CTX_free(provctx);
+}
+
+/* Functions we provide to the core */
+static const OSSL_DISPATCH fips_dispatch_table[] = {
+ { OSSL_FUNC_PROVIDER_TEARDOWN, (void (*)(void))fips_teardown },
{ OSSL_FUNC_PROVIDER_GETTABLE_PARAMS, (void (*)(void))fips_gettable_params },
{ OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))fips_get_params },
{ OSSL_FUNC_PROVIDER_QUERY_OPERATION, (void (*)(void))fips_query },
/* Functions we provide to ourself */
static const OSSL_DISPATCH intern_dispatch_table[] = {
+ { OSSL_FUNC_PROVIDER_TEARDOWN, (void (*)(void))fips_intern_teardown },
{ OSSL_FUNC_PROVIDER_QUERY_OPERATION, (void (*)(void))fips_query },
{ 0, NULL }
};
-int OSSL_provider_init(const OSSL_PROVIDER *provider,
+int OSSL_provider_init(const OSSL_CORE_HANDLE *handle,
const OSSL_DISPATCH *in,
const OSSL_DISPATCH **out,
void **provctx)
{
FIPS_GLOBAL *fgbl;
- OPENSSL_CTX *ctx;
+ OPENSSL_CTX *libctx = NULL;
+ OSSL_self_test_cb_fn *stcbfn = NULL;
+ OSSL_core_get_library_context_fn *c_get_libctx = NULL;
for (; in->function_id != 0; in++) {
switch (in->function_id) {
+ case OSSL_FUNC_CORE_GET_LIBRARY_CONTEXT:
+ c_get_libctx = OSSL_get_core_get_library_context(in);
+ break;
case OSSL_FUNC_CORE_GETTABLE_PARAMS:
c_gettable_params = OSSL_get_core_gettable_params(in);
break;
case OSSL_FUNC_CORE_VSET_ERROR:
c_vset_error = OSSL_get_core_vset_error(in);
break;
+ case OSSL_FUNC_CORE_SET_ERROR_MARK:
+ c_set_error_mark = OSSL_get_core_set_error_mark(in);
+ break;
+ case OSSL_FUNC_CORE_CLEAR_LAST_ERROR_MARK:
+ c_clear_last_error_mark = OSSL_get_core_clear_last_error_mark(in);
+ break;
+ case OSSL_FUNC_CORE_POP_ERROR_TO_MARK:
+ c_pop_error_to_mark = OSSL_get_core_pop_error_to_mark(in);
+ break;
case OSSL_FUNC_CRYPTO_MALLOC:
c_CRYPTO_malloc = OSSL_get_CRYPTO_malloc(in);
break;
case OSSL_FUNC_BIO_FREE:
selftest_params.bio_free_cb = OSSL_get_BIO_free(in);
break;
+ case OSSL_FUNC_BIO_VSNPRINTF:
+ c_BIO_vsnprintf = OSSL_get_BIO_vsnprintf(in);
+ break;
+ case OSSL_FUNC_SELF_TEST_CB: {
+ stcbfn = OSSL_get_self_test_cb(in);
+ break;
+ }
default:
/* Just ignore anything we don't understand */
break;
}
}
- if (!c_get_params(provider, core_params))
+ if (stcbfn != NULL && c_get_libctx != NULL) {
+ stcbfn(c_get_libctx(handle), &selftest_params.cb,
+ &selftest_params.cb_arg);
+ }
+ else {
+ selftest_params.cb = NULL;
+ selftest_params.cb_arg = NULL;
+ }
+
+ if (!c_get_params(handle, core_params))
return 0;
/* Create a context. */
- if ((ctx = OPENSSL_CTX_new()) == NULL)
- return 0;
- if ((fgbl = openssl_ctx_get_data(ctx, OPENSSL_CTX_FIPS_PROV_INDEX,
- &fips_prov_ossl_ctx_method)) == NULL) {
- OPENSSL_CTX_free(ctx);
- return 0;
+ if ((*provctx = PROV_CTX_new()) == NULL
+ || (libctx = OPENSSL_CTX_new()) == NULL) {
+ /*
+ * We free libctx separately here and only here because it hasn't
+ * been attached to *provctx. All other error paths below rely
+ * solely on fips_teardown.
+ */
+ OPENSSL_CTX_free(libctx);
+ goto err;
}
+ PROV_CTX_set0_library_context(*provctx, libctx);
+ PROV_CTX_set0_handle(*provctx, handle);
- fgbl->prov = provider;
+ if ((fgbl = openssl_ctx_get_data(libctx, OPENSSL_CTX_FIPS_PROV_INDEX,
+ &fips_prov_ossl_ctx_method)) == NULL)
+ goto err;
- selftest_params.libctx = PROV_LIBRARY_CONTEXT_OF(ctx);
- if (!SELF_TEST_post(&selftest_params, 0)) {
- OPENSSL_CTX_free(ctx);
- return 0;
- }
+ fgbl->handle = handle;
+
+ selftest_params.libctx = libctx;
+ if (!SELF_TEST_post(&selftest_params, 0))
+ goto err;
/*
* TODO(3.0): Remove me. This is just a dummy call to demonstrate making
* EVP calls from within the FIPS module.
*/
- if (!dummy_evp_call(ctx)) {
- OPENSSL_CTX_free(ctx);
- return 0;
- }
+ if (!dummy_evp_call(libctx))
+ goto err;
*out = fips_dispatch_table;
- *provctx = ctx;
return 1;
+ err:
+ fips_teardown(*provctx);
+ *provctx = NULL;
+ return 0;
}
/*
* that was used in the EVP call that initiated this recursive call.
*/
OSSL_provider_init_fn fips_intern_provider_init;
-int fips_intern_provider_init(const OSSL_PROVIDER *provider,
+int fips_intern_provider_init(const OSSL_CORE_HANDLE *handle,
const OSSL_DISPATCH *in,
const OSSL_DISPATCH **out,
void **provctx)
if (c_get_libctx == NULL)
return 0;
- *provctx = c_get_libctx(provider);
-
+ if ((*provctx = PROV_CTX_new()) == NULL)
+ return 0;
/*
- * Safety measure... we should get the library context that was
- * created up in OSSL_provider_init().
+ * Using the parent library context only works because we are a built-in
+ * internal provider. This is not something that most providers would be
+ * able to do.
*/
- if (*provctx == NULL)
- return 0;
+ PROV_CTX_set0_library_context(*provctx, (OPENSSL_CTX *)c_get_libctx(handle));
+ PROV_CTX_set0_handle(*provctx, handle);
*out = intern_dispatch_table;
return 1;
c_vset_error(NULL, ERR_PACK(lib, 0, reason), fmt, args);
}
-const OSSL_PROVIDER *FIPS_get_provider(OPENSSL_CTX *ctx)
+int ERR_set_mark(void)
+{
+ return c_set_error_mark(NULL);
+}
+
+int ERR_clear_last_mark(void)
+{
+ return c_clear_last_error_mark(NULL);
+}
+
+int ERR_pop_to_mark(void)
+{
+ return c_pop_error_to_mark(NULL);
+}
+
+/*
+ * This must take a library context, since it's called from the depths
+ * of crypto/initthread.c code, where it's (correctly) assumed that the
+ * passed caller argument is an OPENSSL_CTX pointer (since the same routine
+ * is also called from other parts of libcrypto, which all pass around a
+ * OPENSSL_CTX pointer)
+ */
+const OSSL_CORE_HANDLE *FIPS_get_core_handle(OPENSSL_CTX *libctx)
{
- FIPS_GLOBAL *fgbl = openssl_ctx_get_data(ctx, OPENSSL_CTX_FIPS_PROV_INDEX,
+ FIPS_GLOBAL *fgbl = openssl_ctx_get_data(libctx,
+ OPENSSL_CTX_FIPS_PROV_INDEX,
&fips_prov_ossl_ctx_method);
if (fgbl == NULL)
return NULL;
- return fgbl->prov;
+ return fgbl->handle;
}
void *CRYPTO_malloc(size_t num, const char *file, int line)
{
return c_CRYPTO_secure_allocated(ptr);
}
+
+int BIO_snprintf(char *buf, size_t n, const char *format, ...)
+{
+ va_list args;
+ int ret;
+
+ va_start(args, format);
+ ret = c_BIO_vsnprintf(buf, n, format, args);
+ va_end(args);
+ return ret;
+}
projects / openssl.git / blobdiff