/*
- * Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2022 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
* https://www.openssl.org/source/license.html
*/
-#include <string.h>
-#include <stdio.h>
-#include <openssl/core.h>
+#include <assert.h>
#include <openssl/core_dispatch.h>
#include <openssl/core_names.h>
#include <openssl/params.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/kdf.h>
-
-/* TODO(3.0): Needed for dummy_evp_call(). To be removed */
-#include <openssl/sha.h>
-#include <openssl/rand_drbg.h>
-#include <openssl/ec.h>
#include <openssl/fips_names.h>
-
+#include <openssl/rand.h> /* RAND_get0_public() */
+#include <openssl/proverr.h>
#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/names.h"
#include "prov/provider_ctx.h"
#include "prov/providercommon.h"
#include "prov/provider_util.h"
+#include "prov/seeding.h"
+#include "prov/fipscommon.h"
+#include "internal/nelem.h"
#include "self_test.h"
+#include "crypto/context.h"
+#include "internal/core.h"
+
+static const char FIPS_DEFAULT_PROPERTIES[] = "provider=fips,fips=yes";
+static const char FIPS_UNAPPROVED_PROPERTIES[] = "provider=fips,fips=no";
/*
* Forward declarations to ensure that interface functions are correctly
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, "provider=fips,fips=yes", FUNC }, CHECK }
+#define ALGC(NAMES, FUNC, CHECK) \
+ { { NAMES, FIPS_DEFAULT_PROPERTIES, FUNC }, CHECK }
+#define UNAPPROVED_ALGC(NAMES, FUNC, CHECK) \
+ { { NAMES, FIPS_UNAPPROVED_PROPERTIES, FUNC }, CHECK }
#define ALG(NAMES, FUNC) ALGC(NAMES, FUNC, NULL)
+#define UNAPPROVED_ALG(NAMES, FUNC) UNAPPROVED_ALGC(NAMES, FUNC, NULL)
extern OSSL_FUNC_core_thread_start_fn *c_thread_start;
/*
- * TODO(3.0): Should these be stored in the provider side provctx? Could they
- * ever be different from one init to the next? Unfortunately we can't do this
- * at the moment because c_put_error/c_add_error_vdata do not provide
- * us with the OPENSSL_CTX as a parameter.
+ * Should these function pointers be stored in the provider side provctx? Could
+ * they ever be different from one init to the next? We assume not for now.
*/
-static SELF_TEST_POST_PARAMS selftest_params;
-
/* Functions provided by the core */
static OSSL_FUNC_core_gettable_params_fn *c_gettable_params;
static OSSL_FUNC_core_get_params_fn *c_get_params;
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_libctx_fn *c_get_libctx = NULL;
+
+typedef struct {
+ const char *option;
+ unsigned char enabled;
+} FIPS_OPTION;
typedef struct fips_global_st {
const OSSL_CORE_HANDLE *handle;
+ SELF_TEST_POST_PARAMS selftest_params;
+ FIPS_OPTION fips_security_checks;
+ FIPS_OPTION fips_tls1_prf_ems_check;
+ FIPS_OPTION fips_restricted_drgb_digests;
} FIPS_GLOBAL;
-static void *fips_prov_ossl_ctx_new(OPENSSL_CTX *libctx)
+static void init_fips_option(FIPS_OPTION *opt, int enabled)
+{
+ opt->enabled = enabled;
+ opt->option = enabled ? "1" : "0";
+}
+
+void *ossl_fips_prov_ossl_ctx_new(OSSL_LIB_CTX *libctx)
{
FIPS_GLOBAL *fgbl = OPENSSL_zalloc(sizeof(*fgbl));
+ if (fgbl == NULL)
+ return NULL;
+ init_fips_option(&fgbl->fips_security_checks, 1);
+ init_fips_option(&fgbl->fips_tls1_prf_ems_check, 0); /* Disabled by default */
+ init_fips_option(&fgbl->fips_restricted_drgb_digests, 0);
return fgbl;
}
-static void fips_prov_ossl_ctx_free(void *fgbl)
+void ossl_fips_prov_ossl_ctx_free(void *fgbl)
{
OPENSSL_free(fgbl);
}
-static const OPENSSL_CTX_METHOD fips_prov_ossl_ctx_method = {
- fips_prov_ossl_ctx_new,
- fips_prov_ossl_ctx_free,
-};
-
-
/* Parameters we provide to the core */
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_DEFN(OSSL_PROV_PARAM_TLS1_PRF_EMS_CHECK, OSSL_PARAM_INTEGER, NULL, 0),
+ OSSL_PARAM_DEFN(OSSL_PROV_PARAM_DRBG_TRUNC_DIGEST, OSSL_PARAM_INTEGER, NULL, 0),
OSSL_PARAM_END
};
-/*
- * 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).
- */
-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_END
-};
-
-/* TODO(3.0): To be removed */
-static int dummy_evp_call(OPENSSL_CTX *libctx)
-{
- 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);
- unsigned char dgst[SHA256_DIGEST_LENGTH];
- unsigned int dgstlen;
- 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);
-#ifndef OPENSSL_NO_EC
- 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 (!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;
-
-#ifndef OPENSSL_NO_EC
- /* Do some dummy EC calls */
- key = EC_KEY_new_by_curve_name_with_libctx(libctx, NULL, NID_X9_62_prime256v1);
- if (key == NULL)
- goto err;
-
- if (!EC_KEY_generate_key(key))
- goto err;
-#endif
-
- ret = 1;
- err:
- BN_CTX_end(bnctx);
- BN_CTX_free(bnctx);
-
- EVP_KDF_free(kdf);
- EVP_MD_CTX_free(ctx);
- EVP_MD_free(sha256);
+static int fips_get_params_from_core(FIPS_GLOBAL *fgbl)
+{
+ /*
+ * 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 and
+ * OSSL_PROV_FIPS_PARAM_TLS1_PRF_EMS_CHECK are not self test parameters.
+ */
+ OSSL_PARAM core_params[10], *p = core_params;
+
+ *p++ = OSSL_PARAM_construct_utf8_ptr(
+ OSSL_PROV_PARAM_CORE_MODULE_FILENAME,
+ (char **)&fgbl->selftest_params.module_filename,
+ sizeof(fgbl->selftest_params.module_filename));
+ *p++ = OSSL_PARAM_construct_utf8_ptr(
+ OSSL_PROV_FIPS_PARAM_MODULE_MAC,
+ (char **)&fgbl->selftest_params.module_checksum_data,
+ sizeof(fgbl->selftest_params.module_checksum_data));
+ *p++ = OSSL_PARAM_construct_utf8_ptr(
+ OSSL_PROV_FIPS_PARAM_INSTALL_MAC,
+ (char **)&fgbl->selftest_params.indicator_checksum_data,
+ sizeof(fgbl->selftest_params.indicator_checksum_data));
+ *p++ = OSSL_PARAM_construct_utf8_ptr(
+ OSSL_PROV_FIPS_PARAM_INSTALL_STATUS,
+ (char **)&fgbl->selftest_params.indicator_data,
+ sizeof(fgbl->selftest_params.indicator_data));
+ *p++ = OSSL_PARAM_construct_utf8_ptr(
+ OSSL_PROV_FIPS_PARAM_INSTALL_VERSION,
+ (char **)&fgbl->selftest_params.indicator_version,
+ sizeof(fgbl->selftest_params.indicator_version));
+ *p++ = OSSL_PARAM_construct_utf8_ptr(
+ OSSL_PROV_FIPS_PARAM_CONDITIONAL_ERRORS,
+ (char **)&fgbl->selftest_params.conditional_error_check,
+ sizeof(fgbl->selftest_params.conditional_error_check));
+
+/* FIPS features can be enabled or disabled independently */
+#define FIPS_FEATURE_OPTION(fgbl, pname, field) \
+ *p++ = OSSL_PARAM_construct_utf8_ptr( \
+ pname, (char **)&fgbl->field.option, \
+ sizeof(fgbl->field.option))
+
+ FIPS_FEATURE_OPTION(fgbl, OSSL_PROV_FIPS_PARAM_SECURITY_CHECKS,
+ fips_security_checks);
+ FIPS_FEATURE_OPTION(fgbl, OSSL_PROV_FIPS_PARAM_TLS1_PRF_EMS_CHECK,
+ fips_tls1_prf_ems_check);
+ FIPS_FEATURE_OPTION(fgbl, OSSL_PROV_FIPS_PARAM_DRBG_TRUNC_DIGEST,
+ fips_restricted_drgb_digests);
+#undef FIPS_FEATURE_OPTION
+
+ *p = OSSL_PARAM_construct_end();
+
+ if (!c_get_params(fgbl->handle, core_params)) {
+ ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GET_PARAMETER);
+ return 0;
+ }
-#ifndef OPENSSL_NO_EC
- EC_KEY_free(key);
-#endif
- return ret;
+ return 1;
}
static const OSSL_PARAM *fips_gettable_params(void *provctx)
static int fips_get_params(void *provctx, OSSL_PARAM params[])
{
OSSL_PARAM *p;
+ FIPS_GLOBAL *fgbl = ossl_lib_ctx_get_data(ossl_prov_ctx_get0_libctx(provctx),
+ OSSL_LIB_CTX_FIPS_PROV_INDEX);
p = OSSL_PARAM_locate(params, OSSL_PROV_PARAM_NAME);
if (p != NULL && !OSSL_PARAM_set_utf8_ptr(p, "OpenSSL FIPS Provider"))
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;
+#define FIPS_FEATURE_GET(fgbl, pname, field) \
+ p = OSSL_PARAM_locate(params, pname); \
+ if (p != NULL && !OSSL_PARAM_set_int(p, fgbl->field.enabled)) \
+ return 0
+
+ FIPS_FEATURE_GET(fgbl, OSSL_PROV_PARAM_SECURITY_CHECKS,
+ fips_security_checks);
+ FIPS_FEATURE_GET(fgbl, OSSL_PROV_PARAM_TLS1_PRF_EMS_CHECK,
+ fips_tls1_prf_ems_check);
+ FIPS_FEATURE_GET(fgbl, OSSL_PROV_PARAM_DRBG_TRUNC_DIGEST,
+ fips_restricted_drgb_digests);
+#undef FIPS_FEATURE_GET
return 1;
}
-/* 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_MODULE so we have an explicit list */
-
- switch (nid) {
- /* Digests */
- case NID_sha1:
- return "SHA1";
- case NID_sha224:
- return "SHA-224";
- case NID_sha256:
- return "SHA-256";
- case NID_sha384:
- return "SHA-384";
- case NID_sha512:
- return "SHA-512";
- case NID_sha512_224:
- return "SHA-512/224";
- case NID_sha512_256:
- return "SHA-512/256";
- case NID_sha3_224:
- return "SHA3-224";
- case NID_sha3_256:
- return "SHA3-256";
- case NID_sha3_384:
- return "SHA3-384";
- case NID_sha3_512:
- return "SHA3-512";
-
- /* Ciphers */
- case NID_aes_256_ecb:
- return "AES-256-ECB";
- case NID_aes_192_ecb:
- return "AES-192-ECB";
- case NID_aes_128_ecb:
- return "AES-128-ECB";
- case NID_aes_256_cbc:
- return "AES-256-CBC";
- case NID_aes_192_cbc:
- return "AES-192-CBC";
- case NID_aes_128_cbc:
- return "AES-128-CBC";
- case NID_aes_256_ctr:
- return "AES-256-CTR";
- case NID_aes_192_ctr:
- 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;
+static void set_self_test_cb(FIPS_GLOBAL *fgbl)
+{
+ const OSSL_CORE_HANDLE *handle =
+ FIPS_get_core_handle(fgbl->selftest_params.libctx);
+
+ if (c_stcbfn != NULL && c_get_libctx != NULL) {
+ c_stcbfn(c_get_libctx(handle), &fgbl->selftest_params.cb,
+ &fgbl->selftest_params.cb_arg);
+ } else {
+ fgbl->selftest_params.cb = NULL;
+ fgbl->selftest_params.cb_arg = NULL;
}
+}
- return NULL;
+static int fips_self_test(void *provctx)
+{
+ FIPS_GLOBAL *fgbl = ossl_lib_ctx_get_data(ossl_prov_ctx_get0_libctx(provctx),
+ OSSL_LIB_CTX_FIPS_PROV_INDEX);
+
+ set_self_test_cb(fgbl);
+ return SELF_TEST_post(&fgbl->selftest_params, 1) ? 1 : 0;
}
/*
*/
static const OSSL_ALGORITHM fips_digests[] = {
/* Our primary name:NiST name[:our older names] */
- { "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", "provider=fips,fips=yes",
- sha512_256_functions },
+ { PROV_NAMES_SHA1, FIPS_DEFAULT_PROPERTIES, ossl_sha1_functions },
+ { PROV_NAMES_SHA2_224, FIPS_DEFAULT_PROPERTIES, ossl_sha224_functions },
+ { PROV_NAMES_SHA2_256, FIPS_DEFAULT_PROPERTIES, ossl_sha256_functions },
+ { PROV_NAMES_SHA2_384, FIPS_DEFAULT_PROPERTIES, ossl_sha384_functions },
+ { PROV_NAMES_SHA2_512, FIPS_DEFAULT_PROPERTIES, ossl_sha512_functions },
+ { PROV_NAMES_SHA2_512_224, FIPS_DEFAULT_PROPERTIES,
+ ossl_sha512_224_functions },
+ { PROV_NAMES_SHA2_512_256, FIPS_DEFAULT_PROPERTIES,
+ ossl_sha512_256_functions },
/* We agree with NIST here, so one name only */
- { "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 },
+ { PROV_NAMES_SHA3_224, FIPS_DEFAULT_PROPERTIES, ossl_sha3_224_functions },
+ { PROV_NAMES_SHA3_256, FIPS_DEFAULT_PROPERTIES, ossl_sha3_256_functions },
+ { PROV_NAMES_SHA3_384, FIPS_DEFAULT_PROPERTIES, ossl_sha3_384_functions },
+ { PROV_NAMES_SHA3_512, FIPS_DEFAULT_PROPERTIES, ossl_sha3_512_functions },
- { "SHAKE-128:SHAKE128", "provider=fips,fips=yes", shake_128_functions },
- { "SHAKE-256:SHAKE256", "provider=fips,fips=yes", shake_256_functions },
+ { PROV_NAMES_SHAKE_128, FIPS_DEFAULT_PROPERTIES, ossl_shake_128_functions },
+ { PROV_NAMES_SHAKE_256, 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", "provider=fips,fips=yes",
- keccak_kmac_128_functions },
- { "KECCAK-KMAC-256:KECCAK-KMAC256", "provider=fips,fips=yes",
- keccak_kmac_256_functions },
+ { PROV_NAMES_KECCAK_KMAC_128, FIPS_DEFAULT_PROPERTIES,
+ ossl_keccak_kmac_128_functions },
+ { PROV_NAMES_KECCAK_KMAC_256, 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", aes256ecb_functions),
- ALG("AES-192-ECB", aes192ecb_functions),
- ALG("AES-128-ECB", aes128ecb_functions),
- 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),
- ALG("AES-256-XTS", aes256xts_functions),
- ALG("AES-128-XTS", aes128xts_functions),
- ALG("AES-256-GCM:id-aes256-GCM", aes256gcm_functions),
- ALG("AES-192-GCM:id-aes192-GCM", aes192gcm_functions),
- ALG("AES-128-GCM:id-aes128-GCM", aes128gcm_functions),
- ALG("AES-256-CCM:id-aes256-CCM", aes256ccm_functions),
- ALG("AES-192-CCM:id-aes192-CCM", aes192ccm_functions),
- ALG("AES-128-CCM:id-aes128-CCM", aes128ccm_functions),
- ALG("AES-256-WRAP:id-aes256-wrap:AES256-WRAP", aes256wrap_functions),
- ALG("AES-192-WRAP:id-aes192-wrap:AES192-WRAP", aes192wrap_functions),
- ALG("AES-128-WRAP:id-aes128-wrap:AES128-WRAP", aes128wrap_functions),
- ALG("AES-256-WRAP-PAD:id-aes256-wrap-pad:AES256-WRAP-PAD",
- aes256wrappad_functions),
- ALG("AES-192-WRAP-PAD:id-aes192-wrap-pad:AES192-WRAP-PAD",
- aes192wrappad_functions),
- ALG("AES-128-WRAP-PAD:id-aes128-wrap-pad:AES128-WRAP-PAD",
- aes128wrappad_functions),
- ALGC("AES-128-CBC-HMAC-SHA1", aes128cbc_hmac_sha1_functions,
- cipher_capable_aes_cbc_hmac_sha1),
- ALGC("AES-256-CBC-HMAC-SHA1", aes256cbc_hmac_sha1_functions,
- cipher_capable_aes_cbc_hmac_sha1),
- ALGC("AES-128-CBC-HMAC-SHA256", aes128cbc_hmac_sha256_functions,
- cipher_capable_aes_cbc_hmac_sha256),
- ALGC("AES-256-CBC-HMAC-SHA256", aes256cbc_hmac_sha256_functions,
- cipher_capable_aes_cbc_hmac_sha256),
+ ALG(PROV_NAMES_AES_256_ECB, ossl_aes256ecb_functions),
+ ALG(PROV_NAMES_AES_192_ECB, ossl_aes192ecb_functions),
+ ALG(PROV_NAMES_AES_128_ECB, ossl_aes128ecb_functions),
+ ALG(PROV_NAMES_AES_256_CBC, ossl_aes256cbc_functions),
+ ALG(PROV_NAMES_AES_192_CBC, ossl_aes192cbc_functions),
+ ALG(PROV_NAMES_AES_128_CBC, ossl_aes128cbc_functions),
+ ALG(PROV_NAMES_AES_256_CBC_CTS, ossl_aes256cbc_cts_functions),
+ ALG(PROV_NAMES_AES_192_CBC_CTS, ossl_aes192cbc_cts_functions),
+ ALG(PROV_NAMES_AES_128_CBC_CTS, ossl_aes128cbc_cts_functions),
+ ALG(PROV_NAMES_AES_256_OFB, ossl_aes256ofb_functions),
+ ALG(PROV_NAMES_AES_192_OFB, ossl_aes192ofb_functions),
+ ALG(PROV_NAMES_AES_128_OFB, ossl_aes128ofb_functions),
+ ALG(PROV_NAMES_AES_256_CFB, ossl_aes256cfb_functions),
+ ALG(PROV_NAMES_AES_192_CFB, ossl_aes192cfb_functions),
+ ALG(PROV_NAMES_AES_128_CFB, ossl_aes128cfb_functions),
+ ALG(PROV_NAMES_AES_256_CFB1, ossl_aes256cfb1_functions),
+ ALG(PROV_NAMES_AES_192_CFB1, ossl_aes192cfb1_functions),
+ ALG(PROV_NAMES_AES_128_CFB1, ossl_aes128cfb1_functions),
+ ALG(PROV_NAMES_AES_256_CFB8, ossl_aes256cfb8_functions),
+ ALG(PROV_NAMES_AES_192_CFB8, ossl_aes192cfb8_functions),
+ ALG(PROV_NAMES_AES_128_CFB8, ossl_aes128cfb8_functions),
+ ALG(PROV_NAMES_AES_256_CTR, ossl_aes256ctr_functions),
+ ALG(PROV_NAMES_AES_192_CTR, ossl_aes192ctr_functions),
+ ALG(PROV_NAMES_AES_128_CTR, ossl_aes128ctr_functions),
+ ALG(PROV_NAMES_AES_256_XTS, ossl_aes256xts_functions),
+ ALG(PROV_NAMES_AES_128_XTS, ossl_aes128xts_functions),
+ ALG(PROV_NAMES_AES_256_GCM, ossl_aes256gcm_functions),
+ ALG(PROV_NAMES_AES_192_GCM, ossl_aes192gcm_functions),
+ ALG(PROV_NAMES_AES_128_GCM, ossl_aes128gcm_functions),
+ ALG(PROV_NAMES_AES_256_CCM, ossl_aes256ccm_functions),
+ ALG(PROV_NAMES_AES_192_CCM, ossl_aes192ccm_functions),
+ ALG(PROV_NAMES_AES_128_CCM, ossl_aes128ccm_functions),
+ ALG(PROV_NAMES_AES_256_WRAP, ossl_aes256wrap_functions),
+ ALG(PROV_NAMES_AES_192_WRAP, ossl_aes192wrap_functions),
+ ALG(PROV_NAMES_AES_128_WRAP, ossl_aes128wrap_functions),
+ ALG(PROV_NAMES_AES_256_WRAP_PAD, ossl_aes256wrappad_functions),
+ ALG(PROV_NAMES_AES_192_WRAP_PAD, ossl_aes192wrappad_functions),
+ ALG(PROV_NAMES_AES_128_WRAP_PAD, ossl_aes128wrappad_functions),
+ ALG(PROV_NAMES_AES_256_WRAP_INV, ossl_aes256wrapinv_functions),
+ ALG(PROV_NAMES_AES_192_WRAP_INV, ossl_aes192wrapinv_functions),
+ ALG(PROV_NAMES_AES_128_WRAP_INV, ossl_aes128wrapinv_functions),
+ ALG(PROV_NAMES_AES_256_WRAP_PAD_INV, ossl_aes256wrappadinv_functions),
+ ALG(PROV_NAMES_AES_192_WRAP_PAD_INV, ossl_aes192wrappadinv_functions),
+ ALG(PROV_NAMES_AES_128_WRAP_PAD_INV, ossl_aes128wrappadinv_functions),
+ ALGC(PROV_NAMES_AES_128_CBC_HMAC_SHA1, ossl_aes128cbc_hmac_sha1_functions,
+ ossl_cipher_capable_aes_cbc_hmac_sha1),
+ ALGC(PROV_NAMES_AES_256_CBC_HMAC_SHA1, ossl_aes256cbc_hmac_sha1_functions,
+ ossl_cipher_capable_aes_cbc_hmac_sha1),
+ ALGC(PROV_NAMES_AES_128_CBC_HMAC_SHA256, ossl_aes128cbc_hmac_sha256_functions,
+ ossl_cipher_capable_aes_cbc_hmac_sha256),
+ ALGC(PROV_NAMES_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", tdes_ede3_ecb_functions),
- ALG("DES-EDE3-CBC:DES3", tdes_ede3_cbc_functions),
+ UNAPPROVED_ALG(PROV_NAMES_DES_EDE3_ECB, ossl_tdes_ede3_ecb_functions),
+ UNAPPROVED_ALG(PROV_NAMES_DES_EDE3_CBC, ossl_tdes_ede3_cbc_functions),
#endif /* OPENSSL_NO_DES */
{ { NULL, NULL, NULL }, NULL }
};
static const OSSL_ALGORITHM fips_macs[] = {
#ifndef OPENSSL_NO_CMAC
- { "CMAC", "provider=fips,fips=yes", cmac_functions },
+ { PROV_NAMES_CMAC, FIPS_DEFAULT_PROPERTIES, ossl_cmac_functions },
#endif
- { "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 },
+ { PROV_NAMES_GMAC, FIPS_DEFAULT_PROPERTIES, ossl_gmac_functions },
+ { PROV_NAMES_HMAC, FIPS_DEFAULT_PROPERTIES, ossl_hmac_functions },
+ { PROV_NAMES_KMAC_128, FIPS_DEFAULT_PROPERTIES, ossl_kmac128_functions },
+ { PROV_NAMES_KMAC_256, FIPS_DEFAULT_PROPERTIES, ossl_kmac256_functions },
{ NULL, NULL, NULL }
};
static const OSSL_ALGORITHM fips_kdfs[] = {
- { "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 },
+ { PROV_NAMES_HKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_hkdf_functions },
+ { PROV_NAMES_TLS1_3_KDF, FIPS_DEFAULT_PROPERTIES,
+ ossl_kdf_tls1_3_kdf_functions },
+ { PROV_NAMES_SSKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_sskdf_functions },
+ { PROV_NAMES_PBKDF2, FIPS_DEFAULT_PROPERTIES, ossl_kdf_pbkdf2_functions },
+ { PROV_NAMES_SSHKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_sshkdf_functions },
+ { PROV_NAMES_X963KDF, FIPS_DEFAULT_PROPERTIES,
+ ossl_kdf_x963_kdf_functions },
+ { PROV_NAMES_X942KDF_ASN1, FIPS_DEFAULT_PROPERTIES,
+ ossl_kdf_x942_kdf_functions },
+ { PROV_NAMES_TLS1_PRF, FIPS_DEFAULT_PROPERTIES,
+ ossl_kdf_tls1_prf_functions },
+ { PROV_NAMES_KBKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_kbkdf_functions },
{ NULL, NULL, NULL }
};
static const OSSL_ALGORITHM fips_rands[] = {
- { "CTR-DRBG", "provider=fips", drbg_ctr_functions },
- { "HASH-DRBG", "provider=fips", drbg_hash_functions },
- { "HMAC-DRBG", "provider=fips", drbg_hmac_functions },
- { "TEST-RAND", "provider=fips", test_rng_functions },
+ { PROV_NAMES_CTR_DRBG, FIPS_DEFAULT_PROPERTIES, ossl_drbg_ctr_functions },
+ { PROV_NAMES_HASH_DRBG, FIPS_DEFAULT_PROPERTIES, ossl_drbg_hash_functions },
+ { PROV_NAMES_HMAC_DRBG, FIPS_DEFAULT_PROPERTIES, ossl_drbg_ossl_hmac_functions },
+ { PROV_NAMES_TEST_RAND, FIPS_UNAPPROVED_PROPERTIES, ossl_test_rng_functions },
{ NULL, NULL, NULL }
};
static const OSSL_ALGORITHM fips_keyexch[] = {
#ifndef OPENSSL_NO_DH
- { "DH:dhKeyAgreement", "provider=fips,fips=yes", dh_keyexch_functions },
+ { PROV_NAMES_DH, FIPS_DEFAULT_PROPERTIES, ossl_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 },
+ { PROV_NAMES_ECDH, FIPS_DEFAULT_PROPERTIES, ossl_ecdh_keyexch_functions },
+ { PROV_NAMES_X25519, FIPS_DEFAULT_PROPERTIES, ossl_x25519_keyexch_functions },
+ { PROV_NAMES_X448, FIPS_DEFAULT_PROPERTIES, ossl_x448_keyexch_functions },
#endif
+ { PROV_NAMES_TLS1_PRF, FIPS_DEFAULT_PROPERTIES,
+ ossl_kdf_tls1_prf_keyexch_functions },
+ { PROV_NAMES_HKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_hkdf_keyexch_functions },
{ NULL, NULL, NULL }
};
static const OSSL_ALGORITHM fips_signature[] = {
#ifndef OPENSSL_NO_DSA
- { "DSA:dsaEncryption", "provider=fips,fips=yes", dsa_signature_functions },
+ { PROV_NAMES_DSA, FIPS_DEFAULT_PROPERTIES, ossl_dsa_signature_functions },
#endif
- { "RSA:rsaEncryption", "provider=fips,fips=yes", rsa_signature_functions },
+ { PROV_NAMES_RSA, FIPS_DEFAULT_PROPERTIES, ossl_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 },
+ { PROV_NAMES_ED25519, FIPS_UNAPPROVED_PROPERTIES,
+ ossl_ed25519_signature_functions },
+ { PROV_NAMES_ED448, FIPS_UNAPPROVED_PROPERTIES, ossl_ed448_signature_functions },
+ { PROV_NAMES_ECDSA, FIPS_DEFAULT_PROPERTIES, ossl_ecdsa_signature_functions },
+#endif
+ { PROV_NAMES_HMAC, FIPS_DEFAULT_PROPERTIES,
+ ossl_mac_legacy_hmac_signature_functions },
+#ifndef OPENSSL_NO_CMAC
+ { PROV_NAMES_CMAC, FIPS_DEFAULT_PROPERTIES,
+ ossl_mac_legacy_cmac_signature_functions },
#endif
{ NULL, NULL, NULL }
};
static const OSSL_ALGORITHM fips_asym_cipher[] = {
- { "RSA:rsaEncryption", "provider=fips,fips=yes", rsa_asym_cipher_functions },
+ { PROV_NAMES_RSA, FIPS_DEFAULT_PROPERTIES, ossl_rsa_asym_cipher_functions },
+ { NULL, NULL, NULL }
+};
+
+static const OSSL_ALGORITHM fips_asym_kem[] = {
+ { PROV_NAMES_RSA, FIPS_DEFAULT_PROPERTIES, ossl_rsa_asym_kem_functions },
{ NULL, NULL, NULL }
};
static const OSSL_ALGORITHM fips_keymgmt[] = {
#ifndef OPENSSL_NO_DH
- { "DH:dhKeyAgreement", "provider=fips,fips=yes", dh_keymgmt_functions },
+ { PROV_NAMES_DH, FIPS_DEFAULT_PROPERTIES, ossl_dh_keymgmt_functions,
+ PROV_DESCS_DH },
+ { PROV_NAMES_DHX, FIPS_DEFAULT_PROPERTIES, ossl_dhx_keymgmt_functions,
+ PROV_DESCS_DHX },
#endif
#ifndef OPENSSL_NO_DSA
- { "DSA", "provider=fips,fips=yes", dsa_keymgmt_functions },
+ { PROV_NAMES_DSA, FIPS_DEFAULT_PROPERTIES, ossl_dsa_keymgmt_functions,
+ PROV_DESCS_DSA },
#endif
- { "RSA:rsaEncryption", "provider=fips,fips=yes", rsa_keymgmt_functions },
- { "RSA-PSS:RSASSA-PSS", "provider=fips,fips=yes",
- rsapss_keymgmt_functions },
+ { PROV_NAMES_RSA, FIPS_DEFAULT_PROPERTIES, ossl_rsa_keymgmt_functions,
+ PROV_DESCS_RSA },
+ { PROV_NAMES_RSA_PSS, FIPS_DEFAULT_PROPERTIES,
+ ossl_rsapss_keymgmt_functions, PROV_DESCS_RSA_PSS },
#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 },
+ { PROV_NAMES_EC, FIPS_DEFAULT_PROPERTIES, ossl_ec_keymgmt_functions,
+ PROV_DESCS_EC },
+ { PROV_NAMES_X25519, FIPS_DEFAULT_PROPERTIES, ossl_x25519_keymgmt_functions,
+ PROV_DESCS_X25519 },
+ { PROV_NAMES_X448, FIPS_DEFAULT_PROPERTIES, ossl_x448_keymgmt_functions,
+ PROV_DESCS_X448 },
+ { PROV_NAMES_ED25519, FIPS_UNAPPROVED_PROPERTIES, ossl_ed25519_keymgmt_functions,
+ PROV_DESCS_ED25519 },
+ { PROV_NAMES_ED448, FIPS_UNAPPROVED_PROPERTIES, ossl_ed448_keymgmt_functions,
+ PROV_DESCS_ED448 },
+#endif
+ { PROV_NAMES_TLS1_PRF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_keymgmt_functions,
+ PROV_DESCS_TLS1_PRF_SIGN },
+ { PROV_NAMES_HKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_keymgmt_functions,
+ PROV_DESCS_HKDF_SIGN },
+ { PROV_NAMES_HMAC, FIPS_DEFAULT_PROPERTIES, ossl_mac_legacy_keymgmt_functions,
+ PROV_DESCS_HMAC_SIGN },
+#ifndef OPENSSL_NO_CMAC
+ { PROV_NAMES_CMAC, FIPS_DEFAULT_PROPERTIES,
+ ossl_cmac_legacy_keymgmt_functions, PROV_DESCS_CMAC_SIGN },
#endif
{ NULL, NULL, NULL }
};
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:
- ossl_prov_cache_exported_algorithms(fips_ciphers, exported_fips_ciphers);
return exported_fips_ciphers;
case OSSL_OP_MAC:
return fips_macs;
return fips_signature;
case OSSL_OP_ASYM_CIPHER:
return fips_asym_cipher;
+ case OSSL_OP_KEM:
+ return fips_asym_kem;
}
return NULL;
}
static void fips_teardown(void *provctx)
{
- OPENSSL_CTX_free(PROV_LIBRARY_CONTEXT_OF(provctx));
- PROV_CTX_free(provctx);
+ OSSL_LIB_CTX_free(PROV_LIBCTX_OF(provctx));
+ ossl_prov_ctx_free(provctx);
}
static void fips_intern_teardown(void *provctx)
* We know that the library context is the same as for the outer provider,
* so no need to destroy it here.
*/
- PROV_CTX_free(provctx);
+ ossl_prov_ctx_free(provctx);
}
/* Functions we provide to the core */
{ 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 },
- { 0, NULL }
+ { OSSL_FUNC_PROVIDER_GET_CAPABILITIES,
+ (void (*)(void))ossl_prov_get_capabilities },
+ { OSSL_FUNC_PROVIDER_SELF_TEST, (void (*)(void))fips_self_test },
+ OSSL_DISPATCH_END
};
/* 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 }
+ OSSL_DISPATCH_END
};
-
-int OSSL_provider_init(const OSSL_CORE_HANDLE *handle,
- const OSSL_DISPATCH *in,
- const OSSL_DISPATCH **out,
- void **provctx)
+/*
+ * On VMS, the provider init function name is expected to be uppercase,
+ * see the pragmas in <openssl/core.h>. Let's do the same with this
+ * internal name. This is how symbol names are treated by default
+ * by the compiler if nothing else is said, but since this is part
+ * of libfips, and we build our libraries with mixed case symbol names,
+ * we must switch back to this default explicitly here.
+ */
+#ifdef __VMS
+# pragma names save
+# pragma names uppercase,truncated
+#endif
+OSSL_provider_init_fn OSSL_provider_init_int;
+#ifdef __VMS
+# pragma names restore
+#endif
+int OSSL_provider_init_int(const OSSL_CORE_HANDLE *handle,
+ const OSSL_DISPATCH *in,
+ const OSSL_DISPATCH **out,
+ void **provctx)
{
FIPS_GLOBAL *fgbl;
- OPENSSL_CTX *libctx = NULL;
- OSSL_FUNC_self_test_cb_fn *stcbfn = NULL;
- OSSL_FUNC_core_get_library_context_fn *c_get_libctx = NULL;
+ OSSL_LIB_CTX *libctx = NULL;
+ SELF_TEST_POST_PARAMS selftest_params;
+
+ memset(&selftest_params, 0, sizeof(selftest_params));
+ if (!ossl_prov_seeding_from_dispatch(in))
+ goto err;
for (; in->function_id != 0; in++) {
+ /*
+ * We do not support the scenario of an application linked against
+ * multiple versions of libcrypto (e.g. one static and one dynamic), but
+ * sharing a single fips.so. We do a simple sanity check here.
+ */
+#define set_func(c, f) if (c == NULL) c = f; else if (c != f) return 0;
switch (in->function_id) {
- case OSSL_FUNC_CORE_GET_LIBRARY_CONTEXT:
- c_get_libctx = OSSL_FUNC_core_get_library_context(in);
+ case OSSL_FUNC_CORE_GET_LIBCTX:
+ set_func(c_get_libctx, OSSL_FUNC_core_get_libctx(in));
break;
case OSSL_FUNC_CORE_GETTABLE_PARAMS:
- c_gettable_params = OSSL_FUNC_core_gettable_params(in);
+ set_func(c_gettable_params, OSSL_FUNC_core_gettable_params(in));
break;
case OSSL_FUNC_CORE_GET_PARAMS:
- c_get_params = OSSL_FUNC_core_get_params(in);
+ set_func(c_get_params, OSSL_FUNC_core_get_params(in));
break;
case OSSL_FUNC_CORE_THREAD_START:
- c_thread_start = OSSL_FUNC_core_thread_start(in);
+ set_func(c_thread_start, OSSL_FUNC_core_thread_start(in));
break;
case OSSL_FUNC_CORE_NEW_ERROR:
- c_new_error = OSSL_FUNC_core_new_error(in);
+ set_func(c_new_error, OSSL_FUNC_core_new_error(in));
break;
case OSSL_FUNC_CORE_SET_ERROR_DEBUG:
- c_set_error_debug = OSSL_FUNC_core_set_error_debug(in);
+ set_func(c_set_error_debug, OSSL_FUNC_core_set_error_debug(in));
break;
case OSSL_FUNC_CORE_VSET_ERROR:
- c_vset_error = OSSL_FUNC_core_vset_error(in);
+ set_func(c_vset_error, OSSL_FUNC_core_vset_error(in));
break;
case OSSL_FUNC_CORE_SET_ERROR_MARK:
- c_set_error_mark = OSSL_FUNC_core_set_error_mark(in);
+ set_func(c_set_error_mark, OSSL_FUNC_core_set_error_mark(in));
break;
case OSSL_FUNC_CORE_CLEAR_LAST_ERROR_MARK:
- c_clear_last_error_mark = OSSL_FUNC_core_clear_last_error_mark(in);
+ set_func(c_clear_last_error_mark,
+ OSSL_FUNC_core_clear_last_error_mark(in));
break;
case OSSL_FUNC_CORE_POP_ERROR_TO_MARK:
- c_pop_error_to_mark = OSSL_FUNC_core_pop_error_to_mark(in);
+ set_func(c_pop_error_to_mark, OSSL_FUNC_core_pop_error_to_mark(in));
break;
case OSSL_FUNC_CRYPTO_MALLOC:
- c_CRYPTO_malloc = OSSL_FUNC_CRYPTO_malloc(in);
+ set_func(c_CRYPTO_malloc, OSSL_FUNC_CRYPTO_malloc(in));
break;
case OSSL_FUNC_CRYPTO_ZALLOC:
- c_CRYPTO_zalloc = OSSL_FUNC_CRYPTO_zalloc(in);
+ set_func(c_CRYPTO_zalloc, OSSL_FUNC_CRYPTO_zalloc(in));
break;
case OSSL_FUNC_CRYPTO_FREE:
- c_CRYPTO_free = OSSL_FUNC_CRYPTO_free(in);
+ set_func(c_CRYPTO_free, OSSL_FUNC_CRYPTO_free(in));
break;
case OSSL_FUNC_CRYPTO_CLEAR_FREE:
- c_CRYPTO_clear_free = OSSL_FUNC_CRYPTO_clear_free(in);
+ set_func(c_CRYPTO_clear_free, OSSL_FUNC_CRYPTO_clear_free(in));
break;
case OSSL_FUNC_CRYPTO_REALLOC:
- c_CRYPTO_realloc = OSSL_FUNC_CRYPTO_realloc(in);
+ set_func(c_CRYPTO_realloc, OSSL_FUNC_CRYPTO_realloc(in));
break;
case OSSL_FUNC_CRYPTO_CLEAR_REALLOC:
- c_CRYPTO_clear_realloc = OSSL_FUNC_CRYPTO_clear_realloc(in);
+ set_func(c_CRYPTO_clear_realloc,
+ OSSL_FUNC_CRYPTO_clear_realloc(in));
break;
case OSSL_FUNC_CRYPTO_SECURE_MALLOC:
- c_CRYPTO_secure_malloc = OSSL_FUNC_CRYPTO_secure_malloc(in);
+ set_func(c_CRYPTO_secure_malloc,
+ OSSL_FUNC_CRYPTO_secure_malloc(in));
break;
case OSSL_FUNC_CRYPTO_SECURE_ZALLOC:
- c_CRYPTO_secure_zalloc = OSSL_FUNC_CRYPTO_secure_zalloc(in);
+ set_func(c_CRYPTO_secure_zalloc,
+ OSSL_FUNC_CRYPTO_secure_zalloc(in));
break;
case OSSL_FUNC_CRYPTO_SECURE_FREE:
- c_CRYPTO_secure_free = OSSL_FUNC_CRYPTO_secure_free(in);
+ set_func(c_CRYPTO_secure_free,
+ OSSL_FUNC_CRYPTO_secure_free(in));
break;
case OSSL_FUNC_CRYPTO_SECURE_CLEAR_FREE:
- c_CRYPTO_secure_clear_free = OSSL_FUNC_CRYPTO_secure_clear_free(in);
+ set_func(c_CRYPTO_secure_clear_free,
+ OSSL_FUNC_CRYPTO_secure_clear_free(in));
break;
case OSSL_FUNC_CRYPTO_SECURE_ALLOCATED:
- c_CRYPTO_secure_allocated = OSSL_FUNC_CRYPTO_secure_allocated(in);
+ set_func(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);
+ set_func(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);
+ set_func(selftest_params.bio_new_buffer_cb,
+ OSSL_FUNC_BIO_new_membuf(in));
break;
case OSSL_FUNC_BIO_READ_EX:
- selftest_params.bio_read_ex_cb = OSSL_FUNC_BIO_read_ex(in);
+ set_func(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);
+ set_func(selftest_params.bio_free_cb, OSSL_FUNC_BIO_free(in));
break;
case OSSL_FUNC_BIO_VSNPRINTF:
- c_BIO_vsnprintf = OSSL_FUNC_BIO_vsnprintf(in);
+ set_func(c_BIO_vsnprintf, OSSL_FUNC_BIO_vsnprintf(in));
break;
- case OSSL_FUNC_SELF_TEST_CB: {
- stcbfn = OSSL_FUNC_self_test_cb(in);
+ case OSSL_FUNC_SELF_TEST_CB:
+ set_func(c_stcbfn, OSSL_FUNC_self_test_cb(in));
break;
- }
default:
/* Just ignore anything we don't understand */
break;
}
}
- 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 ((*provctx = PROV_CTX_new()) == NULL
- || (libctx = OPENSSL_CTX_new()) == NULL) {
+ if ((*provctx = ossl_prov_ctx_new()) == NULL
+ || (libctx = OSSL_LIB_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);
+ OSSL_LIB_CTX_free(libctx);
goto err;
}
- PROV_CTX_set0_library_context(*provctx, libctx);
- PROV_CTX_set0_handle(*provctx, handle);
- if ((fgbl = openssl_ctx_get_data(libctx, OPENSSL_CTX_FIPS_PROV_INDEX,
- &fips_prov_ossl_ctx_method)) == NULL)
+ if ((fgbl = ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_FIPS_PROV_INDEX)) == NULL)
goto err;
fgbl->handle = handle;
- selftest_params.libctx = libctx;
- if (!SELF_TEST_post(&selftest_params, 0))
- goto err;
+ /*
+ * We did initial set up of selftest_params in a local copy, because we
+ * could not create fgbl until c_CRYPTO_zalloc was defined in the loop
+ * above.
+ */
+ fgbl->selftest_params = selftest_params;
+
+ fgbl->selftest_params.libctx = libctx;
+ set_self_test_cb(fgbl);
+
+ if (!fips_get_params_from_core(fgbl)) {
+ /* Error already raised */
+ goto err;
+ }
/*
- * TODO(3.0): Remove me. This is just a dummy call to demonstrate making
- * EVP calls from within the FIPS module.
+ * Disable the conditional error check if it's disabled in the fips config
+ * file.
*/
- if (!dummy_evp_call(libctx))
+ if (fgbl->selftest_params.conditional_error_check != NULL
+ && strcmp(fgbl->selftest_params.conditional_error_check, "0") == 0)
+ SELF_TEST_disable_conditional_error_state();
+
+ /* Enable or disable FIPS provider options */
+#define FIPS_SET_OPTION(fgbl, field) \
+ if (fgbl->field.option != NULL) { \
+ if (strcmp(fgbl->field.option, "1") == 0) \
+ fgbl->field.enabled = 1; \
+ else if (strcmp(fgbl->field.option, "0") == 0) \
+ fgbl->field.enabled = 0; \
+ else \
+ goto err; \
+ }
+
+ FIPS_SET_OPTION(fgbl, fips_security_checks);
+ FIPS_SET_OPTION(fgbl, fips_tls1_prf_ems_check);
+ FIPS_SET_OPTION(fgbl, fips_restricted_drgb_digests);
+#undef FIPS_SET_OPTION
+
+ ossl_prov_cache_exported_algorithms(fips_ciphers, exported_fips_ciphers);
+
+ if (!SELF_TEST_post(&fgbl->selftest_params, 0)) {
+ ERR_raise(ERR_LIB_PROV, PROV_R_SELF_TEST_POST_FAILURE);
goto err;
+ }
- *out = fips_dispatch_table;
+ ossl_prov_ctx_set0_libctx(*provctx, libctx);
+ ossl_prov_ctx_set0_handle(*provctx, handle);
+ *out = fips_dispatch_table;
return 1;
err:
fips_teardown(*provctx);
+ OSSL_LIB_CTX_free(libctx);
*provctx = NULL;
return 0;
}
* the provider context of this inner instance with the same library context
* 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_CORE_HANDLE *handle,
- const OSSL_DISPATCH *in,
- const OSSL_DISPATCH **out,
- void **provctx)
+OSSL_provider_init_fn ossl_fips_intern_provider_init;
+int ossl_fips_intern_provider_init(const OSSL_CORE_HANDLE *handle,
+ const OSSL_DISPATCH *in,
+ const OSSL_DISPATCH **out,
+ void **provctx)
{
- OSSL_FUNC_core_get_library_context_fn *c_get_libctx = NULL;
+ OSSL_FUNC_core_get_libctx_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_FUNC_core_get_library_context(in);
+ case OSSL_FUNC_CORE_GET_LIBCTX:
+ c_internal_get_libctx = OSSL_FUNC_core_get_libctx(in);
break;
default:
break;
}
}
- if (c_get_libctx == NULL)
+ if (c_internal_get_libctx == NULL)
return 0;
- if ((*provctx = PROV_CTX_new()) == NULL)
+ if ((*provctx = ossl_prov_ctx_new()) == NULL)
return 0;
+
/*
* 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.
*/
- PROV_CTX_set0_library_context(*provctx, (OPENSSL_CTX *)c_get_libctx(handle));
- PROV_CTX_set0_handle(*provctx, handle);
+ ossl_prov_ctx_set0_libctx(*provctx,
+ (OSSL_LIB_CTX *)c_internal_get_libctx(handle));
+ ossl_prov_ctx_set0_handle(*provctx, handle);
*out = intern_dispatch_table;
return 1;
/*
* 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
+ * passed caller argument is an OSSL_LIB_CTX pointer (since the same routine
* is also called from other parts of libcrypto, which all pass around a
- * OPENSSL_CTX pointer)
+ * OSSL_LIB_CTX pointer)
*/
-const OSSL_CORE_HANDLE *FIPS_get_core_handle(OPENSSL_CTX *libctx)
+const OSSL_CORE_HANDLE *FIPS_get_core_handle(OSSL_LIB_CTX *libctx)
{
- FIPS_GLOBAL *fgbl = openssl_ctx_get_data(libctx,
- OPENSSL_CTX_FIPS_PROV_INDEX,
- &fips_prov_ossl_ctx_method);
+ FIPS_GLOBAL *fgbl = ossl_lib_ctx_get_data(libctx,
+ OSSL_LIB_CTX_FIPS_PROV_INDEX);
if (fgbl == NULL)
return NULL;
va_end(args);
return ret;
}
+
+#define FIPS_FEATURE_CHECK(fname, field) \
+ int fname(OSSL_LIB_CTX *libctx) \
+ { \
+ FIPS_GLOBAL *fgbl = \
+ ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_FIPS_PROV_INDEX); \
+ return fgbl->field.enabled; \
+ }
+
+FIPS_FEATURE_CHECK(FIPS_security_check_enabled, fips_security_checks)
+FIPS_FEATURE_CHECK(FIPS_tls_prf_ems_check, fips_tls1_prf_ems_check)
+FIPS_FEATURE_CHECK(FIPS_restricted_drbg_digests_enabled,
+ fips_restricted_drgb_digests)
+#undef FIPS_FEATURE_CHECK
+
+void OSSL_SELF_TEST_get_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK **cb,
+ void **cbarg)
+{
+ assert(libctx != NULL);
+
+ 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;
+ }
+}
projects / openssl.git / blobdiff