X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=providers%2Ffips%2Ffipsprov.c;h=005ad2bb54fcb7c66220660066b84f00cf13ed70;hb=a55b00bdbc00b1632e551cf71bce72137e683c12;hp=50d3c4b0d74a8f5331967a17abe4231eb4e5911a;hpb=261750134865150fe72298fd34dc7214c849b926;p=openssl.git diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index 50d3c4b0d7..005ad2bb54 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -1,5 +1,5 @@ /* - * 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 @@ -7,27 +7,37 @@ * https://www.openssl.org/source/license.html */ -#include -#include -#include -#include +#include #include #include -#include -#include +#include /* NIDs used by ossl_prov_util_nid_to_name() */ +#include +#include /* RAND_get0_public() */ +#include "internal/cryptlib.h" +#include "prov/implementations.h" +#include "prov/provider_ctx.h" +#include "prov/providercommon.h" +#include "prov/providercommonerr.h" +#include "prov/provider_util.h" +#include "self_test.h" -/* TODO(3.0): Needed for dummy_evp_call(). To be removed */ -#include -#include +static const char FIPS_DEFAULT_PROPERTIES[] = "provider=fips,fips=yes"; +static const char FIPS_UNAPPROVED_PROPERTIES[] = "provider=fips,fips=no"; -#include "internal/cryptlib.h" -#include "internal/property.h" -#include "internal/evp_int.h" -#include "internal/provider_algs.h" -#include "internal/provider_ctx.h" -#include "internal/providercommon.h" +/* + * Forward declarations to ensure that interface functions are correctly + * defined. + */ +static OSSL_FUNC_provider_teardown_fn fips_teardown; +static OSSL_FUNC_provider_gettable_params_fn fips_gettable_params; +static OSSL_FUNC_provider_get_params_fn fips_get_params; +static OSSL_FUNC_provider_query_operation_fn fips_query; + +#define ALGC(NAMES, FUNC, CHECK) { { NAMES, FIPS_DEFAULT_PROPERTIES, FUNC }, CHECK } +#define ALG(NAMES, FUNC) ALGC(NAMES, FUNC, NULL) -extern OSSL_core_thread_start_fn *c_thread_start; +extern OSSL_FUNC_core_thread_start_fn *c_thread_start; +int FIPS_security_check_enabled(void); /* * TODO(3.0): Should these be stored in the provider side provctx? Could they @@ -35,30 +45,38 @@ extern OSSL_core_thread_start_fn *c_thread_start; * at the moment because c_put_error/c_add_error_vdata do not provide * us with the OPENSSL_CTX as a parameter. */ + +static SELF_TEST_POST_PARAMS selftest_params; +static int fips_security_checks = 1; +static const char *fips_security_check_option = "1"; + /* Functions provided by the core */ -static OSSL_core_get_param_types_fn *c_get_param_types; -static OSSL_core_get_params_fn *c_get_params; -OSSL_core_thread_start_fn *c_thread_start; -static OSSL_core_put_error_fn *c_put_error; -static OSSL_core_add_error_vdata_fn *c_add_error_vdata; -static OSSL_CRYPTO_malloc_fn *c_CRYPTO_malloc; -static OSSL_CRYPTO_zalloc_fn *c_CRYPTO_zalloc; -static OSSL_CRYPTO_memdup_fn *c_CRYPTO_memdup; -static OSSL_CRYPTO_strdup_fn *c_CRYPTO_strdup; -static OSSL_CRYPTO_strndup_fn *c_CRYPTO_strndup; -static OSSL_CRYPTO_free_fn *c_CRYPTO_free; -static OSSL_CRYPTO_clear_free_fn *c_CRYPTO_clear_free; -static OSSL_CRYPTO_realloc_fn *c_CRYPTO_realloc; -static OSSL_CRYPTO_clear_realloc_fn *c_CRYPTO_clear_realloc; -static OSSL_CRYPTO_secure_malloc_fn *c_CRYPTO_secure_malloc; -static OSSL_CRYPTO_secure_zalloc_fn *c_CRYPTO_secure_zalloc; -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_OPENSSL_hexstr2buf_fn *c_OPENSSL_hexstr2buf; +static OSSL_FUNC_core_gettable_params_fn *c_gettable_params; +static OSSL_FUNC_core_get_params_fn *c_get_params; +OSSL_FUNC_core_thread_start_fn *c_thread_start; +static OSSL_FUNC_core_new_error_fn *c_new_error; +static OSSL_FUNC_core_set_error_debug_fn *c_set_error_debug; +static OSSL_FUNC_core_vset_error_fn *c_vset_error; +static OSSL_FUNC_core_set_error_mark_fn *c_set_error_mark; +static OSSL_FUNC_core_clear_last_error_mark_fn *c_clear_last_error_mark; +static OSSL_FUNC_core_pop_error_to_mark_fn *c_pop_error_to_mark; +static OSSL_FUNC_CRYPTO_malloc_fn *c_CRYPTO_malloc; +static OSSL_FUNC_CRYPTO_zalloc_fn *c_CRYPTO_zalloc; +static OSSL_FUNC_CRYPTO_free_fn *c_CRYPTO_free; +static OSSL_FUNC_CRYPTO_clear_free_fn *c_CRYPTO_clear_free; +static OSSL_FUNC_CRYPTO_realloc_fn *c_CRYPTO_realloc; +static OSSL_FUNC_CRYPTO_clear_realloc_fn *c_CRYPTO_clear_realloc; +static OSSL_FUNC_CRYPTO_secure_malloc_fn *c_CRYPTO_secure_malloc; +static OSSL_FUNC_CRYPTO_secure_zalloc_fn *c_CRYPTO_secure_zalloc; +static OSSL_FUNC_CRYPTO_secure_free_fn *c_CRYPTO_secure_free; +static OSSL_FUNC_CRYPTO_secure_clear_free_fn *c_CRYPTO_secure_clear_free; +static OSSL_FUNC_CRYPTO_secure_allocated_fn *c_CRYPTO_secure_allocated; +static OSSL_FUNC_BIO_vsnprintf_fn *c_BIO_vsnprintf; +static OSSL_FUNC_self_test_cb_fn *c_stcbfn = NULL; +static OSSL_FUNC_core_get_library_context_fn *c_get_libctx = NULL; 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) @@ -84,77 +102,50 @@ static const OSSL_PARAM fips_param_types[] = { OSSL_PARAM_DEFN(OSSL_PROV_PARAM_NAME, OSSL_PARAM_UTF8_PTR, NULL, 0), OSSL_PARAM_DEFN(OSSL_PROV_PARAM_VERSION, OSSL_PARAM_UTF8_PTR, NULL, 0), OSSL_PARAM_DEFN(OSSL_PROV_PARAM_BUILDINFO, OSSL_PARAM_UTF8_PTR, NULL, 0), + OSSL_PARAM_DEFN(OSSL_PROV_PARAM_STATUS, OSSL_PARAM_INTEGER, NULL, 0), + OSSL_PARAM_DEFN(OSSL_PROV_PARAM_SECURITY_CHECKS, OSSL_PARAM_INTEGER, NULL, 0), OSSL_PARAM_END }; -/* TODO(3.0): To be removed */ -static int dummy_evp_call(void *provctx) -{ - 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); - 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]; - int ret = 0; - BN_CTX *bnctx = NULL; - BIGNUM *a = NULL, *b = NULL; - unsigned char randbuf[128]; - RAND_DRBG *drbg = OPENSSL_CTX_get0_public_drbg(libctx); - - if (ctx == NULL || sha256 == NULL || drbg == NULL) - goto err; - - if (!EVP_DigestInit_ex(ctx, sha256, NULL)) - goto err; - if (!EVP_DigestUpdate(ctx, msg, sizeof(msg) - 1)) - goto err; - if (!EVP_DigestFinal(ctx, dgst, &dgstlen)) - goto err; - if (dgstlen != sizeof(exptd) || memcmp(dgst, exptd, sizeof(exptd)) != 0) - goto err; - - bnctx = BN_CTX_new_ex(libctx); - if (bnctx == NULL) - goto err; - BN_CTX_start(bnctx); - a = BN_CTX_get(bnctx); - b = BN_CTX_get(bnctx); - if (b == NULL) - goto err; - BN_zero(a); - if (!BN_one(b) - || !BN_add(a, a, b) - || BN_cmp(a, b) != 0) - goto err; - - if (RAND_DRBG_bytes(drbg, randbuf, sizeof(randbuf)) <= 0) - goto err; - - if (!BN_rand_ex(a, 256, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, bnctx)) - goto err; - - ret = 1; - err: - BN_CTX_end(bnctx); - BN_CTX_free(bnctx); - - EVP_MD_CTX_free(ctx); - EVP_MD_meth_free(sha256); - return ret; -} +/* + * 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_CORE_MODULE_FILENAME). + * OSSL_PROV_FIPS_PARAM_SECURITY_CHECKS is not a self test parameter. + */ +static OSSL_PARAM core_params[] = +{ + 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, + selftest_params.module_checksum_data, + sizeof(selftest_params.module_checksum_data)), + OSSL_PARAM_utf8_ptr(OSSL_PROV_FIPS_PARAM_INSTALL_MAC, + selftest_params.indicator_checksum_data, + sizeof(selftest_params.indicator_checksum_data)), + OSSL_PARAM_utf8_ptr(OSSL_PROV_FIPS_PARAM_INSTALL_STATUS, + selftest_params.indicator_data, + sizeof(selftest_params.indicator_data)), + OSSL_PARAM_utf8_ptr(OSSL_PROV_FIPS_PARAM_INSTALL_VERSION, + selftest_params.indicator_version, + sizeof(selftest_params.indicator_version)), + OSSL_PARAM_utf8_ptr(OSSL_PROV_FIPS_PARAM_CONDITIONAL_ERRORS, + selftest_params.conditional_error_check, + sizeof(selftest_params.conditional_error_check)), + OSSL_PARAM_utf8_ptr(OSSL_PROV_FIPS_PARAM_SECURITY_CHECKS, + fips_security_check_option, + sizeof(fips_security_check_option)), + OSSL_PARAM_END +}; -static const OSSL_PARAM *fips_get_param_types(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; @@ -167,31 +158,54 @@ static int fips_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[]) p = OSSL_PARAM_locate(params, OSSL_PROV_PARAM_BUILDINFO); if (p != NULL && !OSSL_PARAM_set_utf8_ptr(p, OPENSSL_FULL_VERSION_STR)) return 0; - + p = OSSL_PARAM_locate(params, OSSL_PROV_PARAM_STATUS); + if (p != NULL && !OSSL_PARAM_set_int(p, ossl_prov_is_running())) + return 0; + p = OSSL_PARAM_locate(params, OSSL_PROV_PARAM_SECURITY_CHECKS); + if (p != NULL && !OSSL_PARAM_set_int(p, fips_security_checks)) + return 0; return 1; } +static void set_self_test_cb(const OSSL_CORE_HANDLE *handle) +{ + if (c_stcbfn != NULL && c_get_libctx != NULL) { + c_stcbfn(c_get_libctx(handle), &selftest_params.cb, + &selftest_params.cb_arg); + } else { + selftest_params.cb = NULL; + selftest_params.cb_arg = NULL; + } +} + +static int fips_self_test(void *provctx) +{ + set_self_test_cb(FIPS_get_core_handle(selftest_params.libctx)); + return SELF_TEST_post(&selftest_params, 1) ? 1 : 0; +} + /* FIPS specific version of the function of the same name in provlib.c */ +/* TODO(3.0) - Is this function needed ? */ 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 */ case NID_sha1: - return "SHA224"; + return "SHA1"; case NID_sha224: - return "SHA224"; + return "SHA-224"; case NID_sha256: - return "SHA256"; + return "SHA-256"; case NID_sha384: - return "SHA384"; + return "SHA-384"; case NID_sha512: - return "SHA512"; + return "SHA-512"; case NID_sha512_224: - return "SHA512-224"; + return "SHA-512/224"; case NID_sha512_256: - return "SHA512-256"; + return "SHA-512/256"; case NID_sha3_224: return "SHA3-224"; case NID_sha3_256: @@ -220,175 +234,497 @@ const char *ossl_prov_util_nid_to_name(int nid) return "AES-192-CTR"; case NID_aes_128_ctr: return "AES-128-CTR"; + case NID_aes_256_xts: + return "AES-256-XTS"; + case NID_aes_128_xts: + return "AES-128-XTS"; + case NID_aes_256_gcm: + return "AES-256-GCM"; + case NID_aes_192_gcm: + return "AES-192-GCM"; + case NID_aes_128_gcm: + return "AES-128-GCM"; + case NID_aes_256_ccm: + return "AES-256-CCM"; + case NID_aes_192_ccm: + return "AES-192-CCM"; + case NID_aes_128_ccm: + return "AES-128-CCM"; + case NID_id_aes256_wrap: + return "AES-256-WRAP"; + case NID_id_aes192_wrap: + return "AES-192-WRAP"; + case NID_id_aes128_wrap: + return "AES-128-WRAP"; + case NID_id_aes256_wrap_pad: + return "AES-256-WRAP-PAD"; + case NID_id_aes192_wrap_pad: + return "AES-192-WRAP-PAD"; + case NID_id_aes128_wrap_pad: + return "AES-128-WRAP-PAD"; + case NID_des_ede3_ecb: + return "DES-EDE3"; + case NID_des_ede3_cbc: + return "DES-EDE3-CBC"; + case NID_aes_256_cbc_hmac_sha256: + return "AES-256-CBC-HMAC-SHA256"; + case NID_aes_128_cbc_hmac_sha256: + return "AES-128-CBC-HMAC-SHA256"; + case NID_aes_256_cbc_hmac_sha1: + return "AES-256-CBC-HMAC-SHA1"; + case NID_aes_128_cbc_hmac_sha1: + return "AES-128-CBC-HMAC-SHA1"; + default: + break; } return NULL; } +/* + * For the algorithm names, we use the following formula for our primary + * names: + * + * ALGNAME[VERSION?][-SUBNAME[VERSION?]?][-SIZE?][-MODE?] + * + * VERSION is only present if there are multiple versions of + * an alg (MD2, MD4, MD5). It may be omitted if there is only + * one version (if a subsequent version is released in the future, + * we can always change the canonical name, and add the old name + * as an alias). + * + * SUBNAME may be present where we are combining multiple + * algorithms together, e.g. MD5-SHA1. + * + * SIZE is only present if multiple versions of an algorithm exist + * with different sizes (e.g. AES-128-CBC, AES-256-CBC) + * + * MODE is only present where applicable. + * + * We add diverse other names where applicable, such as the names that + * NIST uses, or that are used for ASN.1 OBJECT IDENTIFIERs, or names + * we have used historically. + */ static const OSSL_ALGORITHM fips_digests[] = { - { "SHA1", "fips=yes", sha1_functions }, - { "SHA224", "fips=yes", sha224_functions }, - { "SHA256", "fips=yes", sha256_functions }, - { "SHA384", "fips=yes", sha384_functions }, - { "SHA512", "fips=yes", sha512_functions }, - { "SHA512-224", "fips=yes", sha512_224_functions }, - { "SHA512-256", "fips=yes", sha512_256_functions }, - { "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 }, - { "KMAC128", "fips=yes", keccak_kmac_128_functions }, - { "KMAC256", "fips=yes", keccak_kmac_256_functions }, + /* Our primary name:NiST name[:our older names] */ + { "SHA1:SHA-1:SSL3-SHA1", FIPS_DEFAULT_PROPERTIES, ossl_sha1_functions }, + { "SHA2-224:SHA-224:SHA224", FIPS_DEFAULT_PROPERTIES, + ossl_sha224_functions }, + { "SHA2-256:SHA-256:SHA256", FIPS_DEFAULT_PROPERTIES, + ossl_sha256_functions }, + { "SHA2-384:SHA-384:SHA384", FIPS_DEFAULT_PROPERTIES, + ossl_sha384_functions }, + { "SHA2-512:SHA-512:SHA512", FIPS_DEFAULT_PROPERTIES, + ossl_sha512_functions }, + { "SHA2-512/224:SHA-512/224:SHA512-224", FIPS_DEFAULT_PROPERTIES, + ossl_sha512_224_functions }, + { "SHA2-512/256:SHA-512/256:SHA512-256", FIPS_DEFAULT_PROPERTIES, + ossl_sha512_256_functions }, + + /* We agree with NIST here, so one name only */ + { "SHA3-224", FIPS_DEFAULT_PROPERTIES, ossl_sha3_224_functions }, + { "SHA3-256", FIPS_DEFAULT_PROPERTIES, ossl_sha3_256_functions }, + { "SHA3-384", FIPS_DEFAULT_PROPERTIES, ossl_sha3_384_functions }, + { "SHA3-512", FIPS_DEFAULT_PROPERTIES, ossl_sha3_512_functions }, + + { "SHAKE-128:SHAKE128", FIPS_DEFAULT_PROPERTIES, ossl_shake_128_functions }, + { "SHAKE-256:SHAKE256", FIPS_DEFAULT_PROPERTIES, ossl_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_DEFAULT_PROPERTIES, + ossl_keccak_kmac_128_functions }, + { "KECCAK-KMAC-256:KECCAK-KMAC256", FIPS_DEFAULT_PROPERTIES, + ossl_keccak_kmac_256_functions }, + { NULL, NULL, NULL } +}; + +static const OSSL_ALGORITHM_CAPABLE fips_ciphers[] = { + /* Our primary name[:ASN.1 OID name][:our older names] */ + ALG("AES-256-ECB", ossl_aes256ecb_functions), + ALG("AES-192-ECB", ossl_aes192ecb_functions), + ALG("AES-128-ECB", ossl_aes128ecb_functions), + ALG("AES-256-CBC:AES256", ossl_aes256cbc_functions), + ALG("AES-192-CBC:AES192", ossl_aes192cbc_functions), + ALG("AES-128-CBC:AES128", ossl_aes128cbc_functions), + ALG("AES-256-CBC-CTS", ossl_aes256cbc_cts_functions), + ALG("AES-192-CBC-CTS", ossl_aes192cbc_cts_functions), + ALG("AES-128-CBC-CTS", ossl_aes128cbc_cts_functions), + ALG("AES-256-OFB", ossl_aes256ofb_functions), + ALG("AES-192-OFB", ossl_aes192ofb_functions), + ALG("AES-128-OFB", ossl_aes128ofb_functions), + ALG("AES-256-CFB", ossl_aes256cfb_functions), + ALG("AES-192-CFB", ossl_aes192cfb_functions), + ALG("AES-128-CFB", ossl_aes128cfb_functions), + ALG("AES-256-CFB1", ossl_aes256cfb1_functions), + ALG("AES-192-CFB1", ossl_aes192cfb1_functions), + ALG("AES-128-CFB1", ossl_aes128cfb1_functions), + ALG("AES-256-CFB8", ossl_aes256cfb8_functions), + ALG("AES-192-CFB8", ossl_aes192cfb8_functions), + ALG("AES-128-CFB8", ossl_aes128cfb8_functions), + ALG("AES-256-CTR", ossl_aes256ctr_functions), + ALG("AES-192-CTR", ossl_aes192ctr_functions), + ALG("AES-128-CTR", ossl_aes128ctr_functions), + ALG("AES-256-XTS", ossl_aes256xts_functions), + ALG("AES-128-XTS", ossl_aes128xts_functions), + ALG("AES-256-GCM:id-aes256-GCM", ossl_aes256gcm_functions), + ALG("AES-192-GCM:id-aes192-GCM", ossl_aes192gcm_functions), + ALG("AES-128-GCM:id-aes128-GCM", ossl_aes128gcm_functions), + ALG("AES-256-CCM:id-aes256-CCM", ossl_aes256ccm_functions), + ALG("AES-192-CCM:id-aes192-CCM", ossl_aes192ccm_functions), + ALG("AES-128-CCM:id-aes128-CCM", ossl_aes128ccm_functions), + ALG("AES-256-WRAP:id-aes256-wrap:AES256-WRAP", ossl_aes256wrap_functions), + ALG("AES-192-WRAP:id-aes192-wrap:AES192-WRAP", ossl_aes192wrap_functions), + ALG("AES-128-WRAP:id-aes128-wrap:AES128-WRAP", ossl_aes128wrap_functions), + ALG("AES-256-WRAP-PAD:id-aes256-wrap-pad:AES256-WRAP-PAD", + ossl_aes256wrappad_functions), + ALG("AES-192-WRAP-PAD:id-aes192-wrap-pad:AES192-WRAP-PAD", + ossl_aes192wrappad_functions), + ALG("AES-128-WRAP-PAD:id-aes128-wrap-pad:AES128-WRAP-PAD", + ossl_aes128wrappad_functions), + ALGC("AES-128-CBC-HMAC-SHA1", ossl_aes128cbc_hmac_sha1_functions, + ossl_cipher_capable_aes_cbc_hmac_sha1), + ALGC("AES-256-CBC-HMAC-SHA1", ossl_aes256cbc_hmac_sha1_functions, + ossl_cipher_capable_aes_cbc_hmac_sha1), + ALGC("AES-128-CBC-HMAC-SHA256", ossl_aes128cbc_hmac_sha256_functions, + ossl_cipher_capable_aes_cbc_hmac_sha256), + ALGC("AES-256-CBC-HMAC-SHA256", ossl_aes256cbc_hmac_sha256_functions, + ossl_cipher_capable_aes_cbc_hmac_sha256), +#ifndef OPENSSL_NO_DES + ALG("DES-EDE3-ECB:DES-EDE3", ossl_tdes_ede3_ecb_functions), + ALG("DES-EDE3-CBC:DES3", ossl_tdes_ede3_cbc_functions), +#endif /* OPENSSL_NO_DES */ + { { NULL, NULL, NULL }, NULL } +}; +static OSSL_ALGORITHM exported_fips_ciphers[OSSL_NELEM(fips_ciphers)]; + +static const OSSL_ALGORITHM fips_macs[] = { +#ifndef OPENSSL_NO_CMAC + { "CMAC", FIPS_DEFAULT_PROPERTIES, ossl_cmac_functions }, +#endif + { "GMAC", FIPS_DEFAULT_PROPERTIES, ossl_gmac_functions }, + { "HMAC", FIPS_DEFAULT_PROPERTIES, ossl_hmac_functions }, + { "KMAC-128:KMAC128", FIPS_DEFAULT_PROPERTIES, ossl_kmac128_functions }, + { "KMAC-256:KMAC256", FIPS_DEFAULT_PROPERTIES, ossl_kmac256_functions }, + { NULL, NULL, NULL } +}; + +static const OSSL_ALGORITHM fips_kdfs[] = { + { "HKDF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_hkdf_functions }, + { "SSKDF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_sskdf_functions }, + { "PBKDF2", FIPS_DEFAULT_PROPERTIES, ossl_kdf_pbkdf2_functions }, + { "SSHKDF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_sshkdf_functions }, + { "X963KDF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_x963_kdf_functions }, + { "TLS1-PRF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_tls1_prf_functions }, + { "KBKDF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_kbkdf_functions }, + { NULL, NULL, NULL } +}; +static const OSSL_ALGORITHM fips_rands[] = { + { "CTR-DRBG", FIPS_DEFAULT_PROPERTIES, ossl_drbg_ctr_functions }, + { "HASH-DRBG", FIPS_DEFAULT_PROPERTIES, ossl_drbg_hash_functions }, + { "HMAC-DRBG", FIPS_DEFAULT_PROPERTIES, ossl_drbg_ossl_hmac_functions }, + { "TEST-RAND", FIPS_UNAPPROVED_PROPERTIES, ossl_test_rng_functions }, { NULL, NULL, NULL } }; -static const OSSL_ALGORITHM fips_ciphers[] = { - { "AES-256-ECB", "fips=yes", aes256ecb_functions }, - { "AES-192-ECB", "fips=yes", aes192ecb_functions }, - { "AES-128-ECB", "fips=yes", aes128ecb_functions }, - { "AES-256-CBC", "fips=yes", aes256cbc_functions }, - { "AES-192-CBC", "fips=yes", aes192cbc_functions }, - { "AES-128-CBC", "fips=yes", aes128cbc_functions }, - { "AES-256-CTR", "fips=yes", aes256ctr_functions }, - { "AES-192-CTR", "fips=yes", aes192ctr_functions }, - { "AES-128-CTR", "fips=yes", aes128ctr_functions }, +static const OSSL_ALGORITHM fips_keyexch[] = { +#ifndef OPENSSL_NO_DH + { "DH:dhKeyAgreement", FIPS_DEFAULT_PROPERTIES, ossl_dh_keyexch_functions }, +#endif +#ifndef OPENSSL_NO_EC + { "ECDH", FIPS_DEFAULT_PROPERTIES, ecossl_dh_keyexch_functions }, + { "X25519", FIPS_DEFAULT_PROPERTIES, ossl_x25519_keyexch_functions }, + { "X448", FIPS_DEFAULT_PROPERTIES, ossl_x448_keyexch_functions }, +#endif + { "TLS1-PRF", FIPS_DEFAULT_PROPERTIES, + ossl_kdf_tls1_prf_keyexch_functions }, + { "HKDF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_hkdf_keyexch_functions }, { NULL, NULL, NULL } }; -static const OSSL_ALGORITHM *fips_query(OSSL_PROVIDER *prov, - int operation_id, - int *no_cache) +static const OSSL_ALGORITHM fips_signature[] = { +#ifndef OPENSSL_NO_DSA + { "DSA:dsaEncryption", FIPS_DEFAULT_PROPERTIES, + ossl_dsa_signature_functions }, +#endif + { "RSA:rsaEncryption", FIPS_DEFAULT_PROPERTIES, + ossl_rsa_signature_functions }, +#ifndef OPENSSL_NO_EC + { "ED25519", FIPS_DEFAULT_PROPERTIES, ossl_ed25519_signature_functions }, + { "ED448", FIPS_DEFAULT_PROPERTIES, ossl_ed448_signature_functions }, + { "ECDSA", FIPS_DEFAULT_PROPERTIES, ecossl_dsa_signature_functions }, +#endif + { "HMAC", FIPS_DEFAULT_PROPERTIES, + ossl_mac_legacy_hmac_signature_functions }, +#ifndef OPENSSL_NO_CMAC + { "CMAC", FIPS_DEFAULT_PROPERTIES, + ossl_mac_legacy_cmac_signature_functions }, +#endif + { NULL, NULL, NULL } +}; + +static const OSSL_ALGORITHM fips_asym_cipher[] = { + { "RSA:rsaEncryption", FIPS_DEFAULT_PROPERTIES, + ossl_rsa_asym_cipher_functions }, + { NULL, NULL, NULL } +}; + +static const OSSL_ALGORITHM fips_asym_kem[] = { + { "RSA", FIPS_DEFAULT_PROPERTIES, ossl_rsa_asym_kem_functions }, + { NULL, NULL, NULL } +}; + +static const OSSL_ALGORITHM fips_keymgmt[] = { +#ifndef OPENSSL_NO_DH + { "DH:dhKeyAgreement", FIPS_DEFAULT_PROPERTIES, ossl_dh_keymgmt_functions }, + { "DHX:X9.42 DH:dhpublicnumber", FIPS_DEFAULT_PROPERTIES, + ossl_dhx_keymgmt_functions }, +#endif +#ifndef OPENSSL_NO_DSA + { "DSA", FIPS_DEFAULT_PROPERTIES, ossl_dsa_keymgmt_functions }, +#endif + { "RSA:rsaEncryption", FIPS_DEFAULT_PROPERTIES, + ossl_rsa_keymgmt_functions }, + { "RSA-PSS:RSASSA-PSS", FIPS_DEFAULT_PROPERTIES, + ossl_rsapss_keymgmt_functions }, +#ifndef OPENSSL_NO_EC + { "EC:id-ecPublicKey", FIPS_DEFAULT_PROPERTIES, ossl_ec_keymgmt_functions }, + { "X25519", FIPS_DEFAULT_PROPERTIES, ossl_x25519_keymgmt_functions }, + { "X448", FIPS_DEFAULT_PROPERTIES, ossl_x448_keymgmt_functions }, + { "ED25519", FIPS_DEFAULT_PROPERTIES, ossl_ed25519_keymgmt_functions }, + { "ED448", FIPS_DEFAULT_PROPERTIES, ossl_ed448_keymgmt_functions }, +#endif + { "TLS1-PRF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_keymgmt_functions }, + { "HKDF", FIPS_DEFAULT_PROPERTIES, ossl_kdf_keymgmt_functions }, + { "HMAC", FIPS_DEFAULT_PROPERTIES, ossl_mac_legacy_keymgmt_functions }, +#ifndef OPENSSL_NO_CMAC + { "CMAC", FIPS_DEFAULT_PROPERTIES, + ossl_cossl_mac_legacy_keymgmt_functions }, +#endif + { NULL, NULL, NULL } +}; + +static const OSSL_ALGORITHM *fips_query(void *provctx, int operation_id, + int *no_cache) { *no_cache = 0; + + if (!ossl_prov_is_running()) + return NULL; + switch (operation_id) { case OSSL_OP_DIGEST: return fips_digests; case OSSL_OP_CIPHER: - return fips_ciphers; + ossl_prov_cache_exported_algorithms(fips_ciphers, + exported_fips_ciphers); + return exported_fips_ciphers; + case OSSL_OP_MAC: + return fips_macs; + case OSSL_OP_KDF: + return fips_kdfs; + case OSSL_OP_RAND: + return fips_rands; + 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; + case OSSL_OP_KEM: + return fips_asym_kem; } 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)); + ossl_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 }, - { OSSL_FUNC_PROVIDER_GET_PARAM_TYPES, (void (*)(void))fips_get_param_types }, + ossl_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 }, + { OSSL_FUNC_PROVIDER_GET_CAPABILITIES, + (void (*)(void))provider_get_capabilities }, + { OSSL_FUNC_PROVIDER_SELF_TEST, (void (*)(void))fips_self_test }, { 0, NULL } }; /* 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; for (; in->function_id != 0; in++) { switch (in->function_id) { - case OSSL_FUNC_CORE_GET_PARAM_TYPES: - c_get_param_types = OSSL_get_core_get_param_types(in); + case OSSL_FUNC_CORE_GET_LIBRARY_CONTEXT: + c_get_libctx = OSSL_FUNC_core_get_library_context(in); + break; + case OSSL_FUNC_CORE_GETTABLE_PARAMS: + c_gettable_params = OSSL_FUNC_core_gettable_params(in); break; case OSSL_FUNC_CORE_GET_PARAMS: - c_get_params = OSSL_get_core_get_params(in); + c_get_params = OSSL_FUNC_core_get_params(in); break; case OSSL_FUNC_CORE_THREAD_START: - c_thread_start = OSSL_get_core_thread_start(in); + c_thread_start = OSSL_FUNC_core_thread_start(in); break; - case OSSL_FUNC_CORE_PUT_ERROR: - c_put_error = OSSL_get_core_put_error(in); + case OSSL_FUNC_CORE_NEW_ERROR: + c_new_error = OSSL_FUNC_core_new_error(in); break; - case OSSL_FUNC_CORE_ADD_ERROR_VDATA: - c_add_error_vdata = OSSL_get_core_add_error_vdata(in); + case OSSL_FUNC_CORE_SET_ERROR_DEBUG: + c_set_error_debug = OSSL_FUNC_core_set_error_debug(in); break; - case OSSL_FUNC_CRYPTO_MALLOC: - c_CRYPTO_malloc = OSSL_get_CRYPTO_malloc(in); + case OSSL_FUNC_CORE_VSET_ERROR: + c_vset_error = OSSL_FUNC_core_vset_error(in); break; - case OSSL_FUNC_CRYPTO_ZALLOC: - c_CRYPTO_zalloc = OSSL_get_CRYPTO_zalloc(in); + case OSSL_FUNC_CORE_SET_ERROR_MARK: + c_set_error_mark = OSSL_FUNC_core_set_error_mark(in); break; - case OSSL_FUNC_CRYPTO_MEMDUP: - c_CRYPTO_memdup = OSSL_get_CRYPTO_memdup(in); + case OSSL_FUNC_CORE_CLEAR_LAST_ERROR_MARK: + c_clear_last_error_mark = OSSL_FUNC_core_clear_last_error_mark(in); break; - case OSSL_FUNC_CRYPTO_STRDUP: - c_CRYPTO_strdup = OSSL_get_CRYPTO_strdup(in); + case OSSL_FUNC_CORE_POP_ERROR_TO_MARK: + c_pop_error_to_mark = OSSL_FUNC_core_pop_error_to_mark(in); break; - case OSSL_FUNC_CRYPTO_STRNDUP: - c_CRYPTO_strndup = OSSL_get_CRYPTO_strndup(in); + case OSSL_FUNC_CRYPTO_MALLOC: + c_CRYPTO_malloc = OSSL_FUNC_CRYPTO_malloc(in); + break; + case OSSL_FUNC_CRYPTO_ZALLOC: + c_CRYPTO_zalloc = OSSL_FUNC_CRYPTO_zalloc(in); break; case OSSL_FUNC_CRYPTO_FREE: - c_CRYPTO_free = OSSL_get_CRYPTO_free(in); + c_CRYPTO_free = OSSL_FUNC_CRYPTO_free(in); break; case OSSL_FUNC_CRYPTO_CLEAR_FREE: - c_CRYPTO_clear_free = OSSL_get_CRYPTO_clear_free(in); + c_CRYPTO_clear_free = OSSL_FUNC_CRYPTO_clear_free(in); break; case OSSL_FUNC_CRYPTO_REALLOC: - c_CRYPTO_realloc = OSSL_get_CRYPTO_realloc(in); + c_CRYPTO_realloc = OSSL_FUNC_CRYPTO_realloc(in); break; case OSSL_FUNC_CRYPTO_CLEAR_REALLOC: - c_CRYPTO_clear_realloc = OSSL_get_CRYPTO_clear_realloc(in); + c_CRYPTO_clear_realloc = OSSL_FUNC_CRYPTO_clear_realloc(in); break; case OSSL_FUNC_CRYPTO_SECURE_MALLOC: - c_CRYPTO_secure_malloc = OSSL_get_CRYPTO_secure_malloc(in); + c_CRYPTO_secure_malloc = OSSL_FUNC_CRYPTO_secure_malloc(in); break; case OSSL_FUNC_CRYPTO_SECURE_ZALLOC: - c_CRYPTO_secure_zalloc = OSSL_get_CRYPTO_secure_zalloc(in); + c_CRYPTO_secure_zalloc = OSSL_FUNC_CRYPTO_secure_zalloc(in); break; case OSSL_FUNC_CRYPTO_SECURE_FREE: - c_CRYPTO_secure_free = OSSL_get_CRYPTO_secure_free(in); + c_CRYPTO_secure_free = OSSL_FUNC_CRYPTO_secure_free(in); break; case OSSL_FUNC_CRYPTO_SECURE_CLEAR_FREE: - c_CRYPTO_secure_clear_free = OSSL_get_CRYPTO_secure_clear_free(in); + c_CRYPTO_secure_clear_free = OSSL_FUNC_CRYPTO_secure_clear_free(in); break; case OSSL_FUNC_CRYPTO_SECURE_ALLOCATED: - c_CRYPTO_secure_allocated = OSSL_get_CRYPTO_secure_allocated(in); + c_CRYPTO_secure_allocated = OSSL_FUNC_CRYPTO_secure_allocated(in); + break; + case OSSL_FUNC_BIO_NEW_FILE: + selftest_params.bio_new_file_cb = OSSL_FUNC_BIO_new_file(in); + break; + case OSSL_FUNC_BIO_NEW_MEMBUF: + selftest_params.bio_new_buffer_cb = OSSL_FUNC_BIO_new_membuf(in); break; - case OSSL_FUNC_OPENSSL_HEXSTR2BUF: - c_OPENSSL_hexstr2buf = OSSL_get_OPENSSL_hexstr2buf(in); + case OSSL_FUNC_BIO_READ_EX: + selftest_params.bio_read_ex_cb = OSSL_FUNC_BIO_read_ex(in); break; + case OSSL_FUNC_BIO_FREE: + selftest_params.bio_free_cb = OSSL_FUNC_BIO_free(in); + break; + case OSSL_FUNC_BIO_VSNPRINTF: + c_BIO_vsnprintf = OSSL_FUNC_BIO_vsnprintf(in); + break; + case OSSL_FUNC_SELF_TEST_CB: { + c_stcbfn = OSSL_FUNC_self_test_cb(in); + break; + } default: /* Just ignore anything we don't understand */ break; } } - /* 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); + set_self_test_cb(handle); + + if (!c_get_params(handle, core_params)) { + ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GET_PARAMETER); return 0; } - fgbl->prov = provider; - *out = fips_dispatch_table; - *provctx = ctx; + /* Disable the conditional error check if is disabled in the fips config file*/ + if (selftest_params.conditional_error_check != NULL + && strcmp(selftest_params.conditional_error_check, "0") == 0) + SELF_TEST_disable_conditional_error_state(); - /* - * 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(*provctx)) { - OPENSSL_CTX_free(*provctx); - *provctx = NULL; - return 0; + /* Disable the security check if is disabled in the fips config file*/ + if (fips_security_check_option != NULL + && strcmp(fips_security_check_option, "0") == 0) + fips_security_checks = 0; + + /* Create a context. */ + if ((*provctx = ossl_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; + } + ossl_prov_ctx_set0_library_context(*provctx, libctx); + ossl_prov_ctx_set0_handle(*provctx, handle); + + if ((fgbl = openssl_ctx_get_data(libctx, OPENSSL_CTX_FIPS_PROV_INDEX, + &fips_prov_ossl_ctx_method)) == NULL) + goto err; + + fgbl->handle = handle; + + selftest_params.libctx = libctx; + if (!SELF_TEST_post(&selftest_params, 0)) { + ERR_raise(ERR_LIB_PROV, PROV_R_SELF_TEST_POST_FAILURE); + goto err; } + /* TODO(3.0): Tests will hang if this is removed */ + (void)RAND_get0_public(libctx); + + *out = fips_dispatch_table; return 1; + err: + fips_teardown(*provctx); + *provctx = NULL; + return 0; } /* @@ -399,98 +735,109 @@ int OSSL_provider_init(const OSSL_PROVIDER *provider, * 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) { - OSSL_core_get_library_context_fn *c_get_libctx = NULL; + OSSL_FUNC_core_get_library_context_fn *c_internal_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); + c_internal_get_libctx = OSSL_FUNC_core_get_library_context(in); break; default: break; } } - if (c_get_libctx == NULL) + if (c_internal_get_libctx == NULL) return 0; - *provctx = c_get_libctx(provider); + if ((*provctx = ossl_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; + ossl_prov_ctx_set0_library_context( + *provctx, (OPENSSL_CTX *)c_internal_get_libctx(handle) + ); + ossl_prov_ctx_set0_handle(*provctx, handle); *out = intern_dispatch_table; return 1; } -void ERR_put_error(int lib, int func, int reason, const char *file, int line) +void ERR_new(void) { - /* - * TODO(3.0) the first argument is currently NULL but is expected to - * be passed something else in the future, either an OSSL_PROVIDER or - * a OPENSSL_CTX pointer. - */ - c_put_error(NULL, ERR_PACK(lib, func, reason), file, line); - ERR_add_error_data(1, "(in the FIPS module)"); + c_new_error(NULL); +} + +void ERR_set_debug(const char *file, int line, const char *func) +{ + c_set_error_debug(NULL, file, line, func); } -void ERR_add_error_data(int num, ...) +void ERR_set_error(int lib, int reason, const char *fmt, ...) { va_list args; - va_start(args, num); - ERR_add_error_vdata(num, args); + va_start(args, fmt); + c_vset_error(NULL, ERR_PACK(lib, 0, reason), fmt, args); va_end(args); } -void ERR_add_error_vdata(int num, va_list args) +void ERR_vset_error(int lib, int reason, const char *fmt, va_list args) { - c_add_error_vdata(NULL, num, args); + 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) { - FIPS_GLOBAL *fgbl = openssl_ctx_get_data(ctx, OPENSSL_CTX_FIPS_PROV_INDEX, - &fips_prov_ossl_ctx_method); - - if (fgbl == NULL) - return NULL; - - return fgbl->prov; + return c_set_error_mark(NULL); } -void *CRYPTO_malloc(size_t num, const char *file, int line) +int ERR_clear_last_mark(void) { - return c_CRYPTO_malloc(num, file, line); + return c_clear_last_error_mark(NULL); } -void *CRYPTO_zalloc(size_t num, const char *file, int line) +int ERR_pop_to_mark(void) { - return c_CRYPTO_zalloc(num, file, line); + return c_pop_error_to_mark(NULL); } -void *CRYPTO_memdup(const void *str, size_t siz, const char *file, int line) +/* + * 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) { - return c_CRYPTO_memdup(str, siz, file, line); + 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->handle; } -char *CRYPTO_strdup(const char *str, const char *file, int line) +void *CRYPTO_malloc(size_t num, const char *file, int line) { - return c_CRYPTO_strdup(str, file, line); + return c_CRYPTO_malloc(num, file, line); } -char *CRYPTO_strndup(const char *str, size_t s, const char *file, int line) +void *CRYPTO_zalloc(size_t num, const char *file, int line) { - return c_CRYPTO_strndup(str, s, file, line); + return c_CRYPTO_zalloc(num, file, line); } void CRYPTO_free(void *ptr, const char *file, int line) @@ -534,12 +881,40 @@ void CRYPTO_secure_clear_free(void *ptr, size_t num, const char *file, int line) c_CRYPTO_secure_clear_free(ptr, num, file, line); } -unsigned char *OPENSSL_hexstr2buf(const char *str, long *len) +int CRYPTO_secure_allocated(const void *ptr) { - return c_OPENSSL_hexstr2buf(str, len); + return c_CRYPTO_secure_allocated(ptr); } -int CRYPTO_secure_allocated(const void *ptr) +int BIO_snprintf(char *buf, size_t n, const char *format, ...) { - return c_CRYPTO_secure_allocated(ptr); + va_list args; + int ret; + + va_start(args, format); + ret = c_BIO_vsnprintf(buf, n, format, args); + va_end(args); + return ret; +} + +int FIPS_security_check_enabled(void) +{ + return fips_security_checks; +} + +void OSSL_SELF_TEST_get_callback(OPENSSL_CTX *libctx, OSSL_CALLBACK **cb, + void **cbarg) +{ + if (libctx == NULL) + libctx = selftest_params.libctx; + + if (c_stcbfn != NULL && c_get_libctx != NULL) { + /* Get the parent libctx */ + c_stcbfn(c_get_libctx(FIPS_get_core_handle(libctx)), cb, cbarg); + } else { + if (cb != NULL) + *cb = NULL; + if (cbarg != NULL) + *cbarg = NULL; + } }