#include <openssl/params.h>
#include <openssl/err.h>
#include <openssl/evp.h>
+
/* TODO(3.0): Needed for dummy_evp_call(). To be removed */
#include <openssl/sha.h>
+#include <openssl/rand_drbg.h>
+
#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"
+extern OSSL_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.
+ */
/* Functions provided by the core */
-static OSSL_core_get_param_types_fn *c_get_param_types = NULL;
-static OSSL_core_get_params_fn *c_get_params = NULL;
-static OSSL_core_put_error_fn *c_put_error = NULL;
-static OSSL_core_add_error_vdata_fn *c_add_error_vdata = NULL;
+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;
+
+typedef struct fips_global_st {
+ const OSSL_PROVIDER *prov;
+} FIPS_GLOBAL;
+
+static void *fips_prov_ossl_ctx_new(OPENSSL_CTX *libctx)
+{
+ FIPS_GLOBAL *fgbl = OPENSSL_zalloc(sizeof(*fgbl));
+
+ return fgbl;
+}
+
+static void 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_ITEM fips_param_types[] = {
};
/* TODO(3.0): To be removed */
-static int dummy_evp_call(OPENSSL_CTX *libctx)
+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!";
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)
+ if (ctx == NULL || sha256 == NULL || drbg == NULL)
goto err;
if (!EVP_DigestInit_ex(ctx, sha256, NULL))
|| !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;
return fips_param_types;
}
-static int fips_get_params(const OSSL_PROVIDER *prov,
- const OSSL_PARAM params[])
+static int fips_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[])
{
- const OSSL_PARAM *p;
+ OSSL_PARAM *p;
p = OSSL_PARAM_locate(params, OSSL_PROV_PARAM_NAME);
if (p != NULL && !OSSL_PARAM_set_utf8_ptr(p, "OpenSSL FIPS Provider"))
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_MODE so we have an explicit list */
+
+ switch (nid) {
+ /* Digests */
+ case NID_sha1:
+ return "SHA224";
+ case NID_sha224:
+ return "SHA224";
+ case NID_sha256:
+ return "SHA256";
+ case NID_sha384:
+ return "SHA384";
+ case NID_sha512:
+ return "SHA512";
+ case NID_sha512_224:
+ return "SHA512-224";
+ case NID_sha512_256:
+ return "SHA512-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";
+ }
+
+ return NULL;
+}
+
static const OSSL_ALGORITHM fips_digests[] = {
{ "SHA1", "fips=yes", sha1_functions },
{ "SHA224", "fips=yes", sha224_functions },
const OSSL_DISPATCH **out,
void **provctx)
{
+ FIPS_GLOBAL *fgbl;
OPENSSL_CTX *ctx;
for (; in->function_id != 0; in++) {
case OSSL_FUNC_CORE_GET_PARAMS:
c_get_params = OSSL_get_core_get_params(in);
break;
+ case OSSL_FUNC_CORE_THREAD_START:
+ c_thread_start = OSSL_get_core_thread_start(in);
+ break;
case OSSL_FUNC_CORE_PUT_ERROR:
c_put_error = OSSL_get_core_put_error(in);
break;
case OSSL_FUNC_CORE_ADD_ERROR_VDATA:
c_add_error_vdata = OSSL_get_core_add_error_vdata(in);
break;
- /* Just ignore anything we don't understand */
+ case OSSL_FUNC_CRYPTO_MALLOC:
+ c_CRYPTO_malloc = OSSL_get_CRYPTO_malloc(in);
+ break;
+ case OSSL_FUNC_CRYPTO_ZALLOC:
+ c_CRYPTO_zalloc = OSSL_get_CRYPTO_zalloc(in);
+ break;
+ case OSSL_FUNC_CRYPTO_MEMDUP:
+ c_CRYPTO_memdup = OSSL_get_CRYPTO_memdup(in);
+ break;
+ case OSSL_FUNC_CRYPTO_STRDUP:
+ c_CRYPTO_strdup = OSSL_get_CRYPTO_strdup(in);
+ break;
+ case OSSL_FUNC_CRYPTO_STRNDUP:
+ c_CRYPTO_strndup = OSSL_get_CRYPTO_strndup(in);
+ break;
+ case OSSL_FUNC_CRYPTO_FREE:
+ c_CRYPTO_free = OSSL_get_CRYPTO_free(in);
+ break;
+ case OSSL_FUNC_CRYPTO_CLEAR_FREE:
+ c_CRYPTO_clear_free = OSSL_get_CRYPTO_clear_free(in);
+ break;
+ case OSSL_FUNC_CRYPTO_REALLOC:
+ c_CRYPTO_realloc = OSSL_get_CRYPTO_realloc(in);
+ break;
+ case OSSL_FUNC_CRYPTO_CLEAR_REALLOC:
+ c_CRYPTO_clear_realloc = OSSL_get_CRYPTO_clear_realloc(in);
+ break;
+ case OSSL_FUNC_CRYPTO_SECURE_MALLOC:
+ c_CRYPTO_secure_malloc = OSSL_get_CRYPTO_secure_malloc(in);
+ break;
+ case OSSL_FUNC_CRYPTO_SECURE_ZALLOC:
+ c_CRYPTO_secure_zalloc = OSSL_get_CRYPTO_secure_zalloc(in);
+ break;
+ case OSSL_FUNC_CRYPTO_SECURE_FREE:
+ c_CRYPTO_secure_free = OSSL_get_CRYPTO_secure_free(in);
+ break;
+ case OSSL_FUNC_CRYPTO_SECURE_CLEAR_FREE:
+ c_CRYPTO_secure_clear_free = OSSL_get_CRYPTO_secure_clear_free(in);
+ break;
+ case OSSL_FUNC_CRYPTO_SECURE_ALLOCATED:
+ c_CRYPTO_secure_allocated = OSSL_get_CRYPTO_secure_allocated(in);
+ break;
+ case OSSL_FUNC_OPENSSL_HEXSTR2BUF:
+ c_OPENSSL_hexstr2buf = OSSL_get_OPENSSL_hexstr2buf(in);
+ break;
default:
+ /* Just ignore anything we don't understand */
break;
}
}
- ctx = OPENSSL_CTX_new();
- if (ctx == NULL)
+ /* 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;
+ }
+ fgbl->prov = provider;
+ *out = fips_dispatch_table;
+ *provctx = ctx;
/*
* 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);
+ if (!dummy_evp_call(*provctx)) {
+ OPENSSL_CTX_free(*provctx);
+ *provctx = NULL;
return 0;
}
- *out = fips_dispatch_table;
- *provctx = ctx;
return 1;
}
/*
* The internal init function used when the FIPS module uses EVP to call
* another algorithm also in the FIPS module. This is a recursive call that has
- * been made from within the FIPS module itself. Normally we are responsible for
- * providing our own provctx value, but in this recursive case it has been
- * pre-populated for us with the same library context that was used in the EVP
- * call that initiated this recursive call - so we don't need to do anything
- * further with that parameter. This only works because we *know* in the core
- * code that the FIPS module uses a library context for its provctx. This is
- * not generally true for all providers.
+ * been made from within the FIPS module itself. To make this work, we populate
+ * 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_PROVIDER *provider,
const OSSL_DISPATCH **out,
void **provctx)
{
+ 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;
+ default:
+ break;
+ }
+ }
+
+ if (c_get_libctx == NULL)
+ return 0;
+
+ *provctx = c_get_libctx(provider);
+
+ /*
+ * Safety measure... we should get the library context that was
+ * created up in OSSL_provider_init().
+ */
+ if (*provctx == NULL)
+ return 0;
+
*out = intern_dispatch_table;
return 1;
}
void ERR_put_error(int lib, int func, int reason, const char *file, int line)
{
/*
- * TODO(3.0): This works for the FIPS module because we're going to be
- * using lib/func/reason codes that libcrypto already knows about. This
- * won't work for third party providers that have their own error mechanisms,
- * so we'll need to come up with something else for them.
+ * 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(lib, func, reason, file, line);
+ c_put_error(NULL, ERR_PACK(lib, func, reason), file, line);
+ ERR_add_error_data(1, "(in the FIPS module)");
}
void ERR_add_error_data(int num, ...)
{
va_list args;
+
va_start(args, num);
ERR_add_error_vdata(num, args);
va_end(args);
void ERR_add_error_vdata(int num, va_list args)
{
- c_add_error_vdata(num, args);
+ c_add_error_vdata(NULL, num, args);
+}
+
+const OSSL_PROVIDER *FIPS_get_provider(OPENSSL_CTX *ctx)
+{
+ 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;
+}
+
+void *CRYPTO_malloc(size_t num, const char *file, int line)
+{
+ return c_CRYPTO_malloc(num, file, line);
+}
+
+void *CRYPTO_zalloc(size_t num, const char *file, int line)
+{
+ return c_CRYPTO_zalloc(num, file, line);
+}
+
+void *CRYPTO_memdup(const void *str, size_t siz, const char *file, int line)
+{
+ return c_CRYPTO_memdup(str, siz, file, line);
+}
+
+char *CRYPTO_strdup(const char *str, const char *file, int line)
+{
+ return c_CRYPTO_strdup(str, file, line);
+}
+
+char *CRYPTO_strndup(const char *str, size_t s, const char *file, int line)
+{
+ return c_CRYPTO_strndup(str, s, file, line);
+}
+
+void CRYPTO_free(void *ptr, const char *file, int line)
+{
+ c_CRYPTO_free(ptr, file, line);
+}
+
+void CRYPTO_clear_free(void *ptr, size_t num, const char *file, int line)
+{
+ c_CRYPTO_clear_free(ptr, num, file, line);
+}
+
+void *CRYPTO_realloc(void *addr, size_t num, const char *file, int line)
+{
+ return c_CRYPTO_realloc(addr, num, file, line);
+}
+
+void *CRYPTO_clear_realloc(void *addr, size_t old_num, size_t num,
+ const char *file, int line)
+{
+ return c_CRYPTO_clear_realloc(addr, old_num, num, file, line);
+}
+
+void *CRYPTO_secure_malloc(size_t num, const char *file, int line)
+{
+ return c_CRYPTO_secure_malloc(num, file, line);
+}
+
+void *CRYPTO_secure_zalloc(size_t num, const char *file, int line)
+{
+ return c_CRYPTO_secure_zalloc(num, file, line);
+}
+
+void CRYPTO_secure_free(void *ptr, const char *file, int line)
+{
+ c_CRYPTO_secure_free(ptr, file, line);
+}
+
+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)
+{
+ return c_OPENSSL_hexstr2buf(str, len);
+}
+
+int CRYPTO_secure_allocated(const void *ptr)
+{
+ return c_CRYPTO_secure_allocated(ptr);
}
projects / openssl.git / blobdiff