/* 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 "internal/cryptlib.h"
#include "internal/property.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.
+ * 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;
-extern OSSL_core_thread_start_fn *c_thread_start;
-OSSL_core_thread_start_fn *c_thread_start = 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_gettable_params_fn *c_gettable_params;
+static OSSL_core_get_params_fn *c_get_params;
+OSSL_core_thread_start_fn *c_thread_start;
+static OSSL_core_new_error_fn *c_new_error;
+static OSSL_core_set_error_debug_fn *c_set_error_debug;
+static OSSL_core_vset_error_fn *c_vset_error;
+static OSSL_CRYPTO_malloc_fn *c_CRYPTO_malloc;
+static OSSL_CRYPTO_zalloc_fn *c_CRYPTO_zalloc;
+static OSSL_CRYPTO_free_fn *c_CRYPTO_free;
+static OSSL_CRYPTO_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;
typedef struct fips_global_st {
const OSSL_PROVIDER *prov;
/* Parameters we provide to the core */
-static const OSSL_ITEM fips_param_types[] = {
- { OSSL_PARAM_UTF8_PTR, OSSL_PROV_PARAM_NAME },
- { OSSL_PARAM_UTF8_PTR, OSSL_PROV_PARAM_VERSION },
- { OSSL_PARAM_UTF8_PTR, OSSL_PROV_PARAM_BUILDINFO },
- { 0, NULL }
+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_END
};
/* TODO(3.0): To be removed */
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
if (ctx == NULL || sha256 == NULL || drbg == NULL)
goto err;
|| !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_ex(libctx, 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_MD_CTX_free(ctx);
EVP_MD_meth_free(sha256);
+
+#ifndef OPENSSL_NO_EC
+ EC_KEY_free(key);
+#endif
return ret;
}
-static const OSSL_ITEM *fips_get_param_types(const OSSL_PROVIDER *prov)
+static const OSSL_PARAM *fips_gettable_params(const OSSL_PROVIDER *prov)
{
return fips_param_types;
}
{ "AES-256-CTR", "fips=yes", aes256ctr_functions },
{ "AES-192-CTR", "fips=yes", aes192ctr_functions },
{ "AES-128-CTR", "fips=yes", aes128ctr_functions },
+ { "id-aes256-GCM", "fips=yes", aes256gcm_functions },
+ { "id-aes192-GCM", "fips=yes", aes192gcm_functions },
+ { "id-aes128-GCM", "fips=yes", aes128gcm_functions },
+ { NULL, NULL, NULL }
+};
+
+static const OSSL_ALGORITHM fips_macs[] = {
+ { "CMAC", "fips=yes", cmac_functions },
{ NULL, NULL, NULL }
};
return fips_digests;
case OSSL_OP_CIPHER:
return fips_ciphers;
+ case OSSL_OP_MAC:
+ return fips_macs;
}
return NULL;
}
* use OPENSSL_CTX_free directly as our teardown function
*/
{ OSSL_FUNC_PROVIDER_TEARDOWN, (void (*)(void))OPENSSL_CTX_free },
- { OSSL_FUNC_PROVIDER_GET_PARAM_TYPES, (void (*)(void))fips_get_param_types },
+ { 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 },
{ 0, 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_GETTABLE_PARAMS:
+ c_gettable_params = OSSL_get_core_gettable_params(in);
break;
case OSSL_FUNC_CORE_GET_PARAMS:
c_get_params = OSSL_get_core_get_params(in);
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);
+ case OSSL_FUNC_CORE_NEW_ERROR:
+ c_new_error = OSSL_get_core_new_error(in);
+ break;
+ case OSSL_FUNC_CORE_SET_ERROR_DEBUG:
+ c_set_error_debug = OSSL_get_core_set_error_debug(in);
+ break;
+ case OSSL_FUNC_CORE_VSET_ERROR:
+ c_vset_error = OSSL_get_core_vset_error(in);
+ break;
+ 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_FREE:
+ c_CRYPTO_free = OSSL_get_CRYPTO_free(in);
break;
- case OSSL_FUNC_CORE_ADD_ERROR_VDATA:
- c_add_error_vdata = OSSL_get_core_add_error_vdata(in);
+ 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;
- /* Just ignore anything we don't understand */
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;
-
- fgbl = openssl_ctx_get_data(ctx, OPENSSL_CTX_FIPS_PROV_INDEX,
- &fips_prov_ossl_ctx_method);
-
- if (fgbl == NULL)
- goto err;
-
+ 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;
}
return 1;
-
- err:
- OPENSSL_CTX_free(ctx);
- return 0;
}
/*
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_add_error_data(int num, ...)
+void ERR_set_debug(const char *file, int line, const char *func)
+{
+ c_set_error_debug(NULL, file, line, func);
+}
+
+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)
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_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);
+}
+
+int CRYPTO_secure_allocated(const void *ptr)
+{
+ return c_CRYPTO_secure_allocated(ptr);
+}
projects / thirdparty / openssl.git / blobdiff