diff options
Diffstat (limited to 'providers/implementations/kdfs')
-rw-r--r-- | providers/implementations/kdfs/hkdf.c | 16 | ||||
-rw-r--r-- | providers/implementations/kdfs/kbkdf.c | 12 | ||||
-rw-r--r-- | providers/implementations/kdfs/krb5kdf.c | 16 | ||||
-rw-r--r-- | providers/implementations/kdfs/pbkdf2.c | 12 | ||||
-rw-r--r-- | providers/implementations/kdfs/scrypt.c | 12 | ||||
-rw-r--r-- | providers/implementations/kdfs/sshkdf.c | 16 | ||||
-rw-r--r-- | providers/implementations/kdfs/sskdf.c | 18 | ||||
-rw-r--r-- | providers/implementations/kdfs/tls1_prf.c | 12 | ||||
-rw-r--r-- | providers/implementations/kdfs/x942kdf.c | 16 |
9 files changed, 65 insertions, 65 deletions
diff --git a/providers/implementations/kdfs/hkdf.c b/providers/implementations/kdfs/hkdf.c index bbf622c3df..77f4f2c8cc 100644 --- a/providers/implementations/kdfs/hkdf.c +++ b/providers/implementations/kdfs/hkdf.c @@ -31,14 +31,14 @@ #define HKDF_MAXBUF 1024 -static OSSL_OP_kdf_newctx_fn kdf_hkdf_new; -static OSSL_OP_kdf_freectx_fn kdf_hkdf_free; -static OSSL_OP_kdf_reset_fn kdf_hkdf_reset; -static OSSL_OP_kdf_derive_fn kdf_hkdf_derive; -static OSSL_OP_kdf_settable_ctx_params_fn kdf_hkdf_settable_ctx_params; -static OSSL_OP_kdf_set_ctx_params_fn kdf_hkdf_set_ctx_params; -static OSSL_OP_kdf_gettable_ctx_params_fn kdf_hkdf_gettable_ctx_params; -static OSSL_OP_kdf_get_ctx_params_fn kdf_hkdf_get_ctx_params; +static OSSL_FUNC_kdf_newctx_fn kdf_hkdf_new; +static OSSL_FUNC_kdf_freectx_fn kdf_hkdf_free; +static OSSL_FUNC_kdf_reset_fn kdf_hkdf_reset; +static OSSL_FUNC_kdf_derive_fn kdf_hkdf_derive; +static OSSL_FUNC_kdf_settable_ctx_params_fn kdf_hkdf_settable_ctx_params; +static OSSL_FUNC_kdf_set_ctx_params_fn kdf_hkdf_set_ctx_params; +static OSSL_FUNC_kdf_gettable_ctx_params_fn kdf_hkdf_gettable_ctx_params; +static OSSL_FUNC_kdf_get_ctx_params_fn kdf_hkdf_get_ctx_params; static int HKDF(const EVP_MD *evp_md, const unsigned char *salt, size_t salt_len, diff --git a/providers/implementations/kdfs/kbkdf.c b/providers/implementations/kdfs/kbkdf.c index 12bf711eed..86177bebdf 100644 --- a/providers/implementations/kdfs/kbkdf.c +++ b/providers/implementations/kdfs/kbkdf.c @@ -69,12 +69,12 @@ typedef struct { } KBKDF; /* Definitions needed for typechecking. */ -static OSSL_OP_kdf_newctx_fn kbkdf_new; -static OSSL_OP_kdf_freectx_fn kbkdf_free; -static OSSL_OP_kdf_reset_fn kbkdf_reset; -static OSSL_OP_kdf_derive_fn kbkdf_derive; -static OSSL_OP_kdf_settable_ctx_params_fn kbkdf_settable_ctx_params; -static OSSL_OP_kdf_set_ctx_params_fn kbkdf_set_ctx_params; +static OSSL_FUNC_kdf_newctx_fn kbkdf_new; +static OSSL_FUNC_kdf_freectx_fn kbkdf_free; +static OSSL_FUNC_kdf_reset_fn kbkdf_reset; +static OSSL_FUNC_kdf_derive_fn kbkdf_derive; +static OSSL_FUNC_kdf_settable_ctx_params_fn kbkdf_settable_ctx_params; +static OSSL_FUNC_kdf_set_ctx_params_fn kbkdf_set_ctx_params; /* Not all platforms have htobe32(). */ static uint32_t be32(uint32_t host) diff --git a/providers/implementations/kdfs/krb5kdf.c b/providers/implementations/kdfs/krb5kdf.c index 0a97b8e3f9..4ae29a24c4 100644 --- a/providers/implementations/kdfs/krb5kdf.c +++ b/providers/implementations/kdfs/krb5kdf.c @@ -32,14 +32,14 @@ /* KRB5 KDF defined in RFC 3961, Section 5.1 */ -static OSSL_OP_kdf_newctx_fn krb5kdf_new; -static OSSL_OP_kdf_freectx_fn krb5kdf_free; -static OSSL_OP_kdf_reset_fn krb5kdf_reset; -static OSSL_OP_kdf_derive_fn krb5kdf_derive; -static OSSL_OP_kdf_settable_ctx_params_fn krb5kdf_settable_ctx_params; -static OSSL_OP_kdf_set_ctx_params_fn krb5kdf_set_ctx_params; -static OSSL_OP_kdf_gettable_ctx_params_fn krb5kdf_gettable_ctx_params; -static OSSL_OP_kdf_get_ctx_params_fn krb5kdf_get_ctx_params; +static OSSL_FUNC_kdf_newctx_fn krb5kdf_new; +static OSSL_FUNC_kdf_freectx_fn krb5kdf_free; +static OSSL_FUNC_kdf_reset_fn krb5kdf_reset; +static OSSL_FUNC_kdf_derive_fn krb5kdf_derive; +static OSSL_FUNC_kdf_settable_ctx_params_fn krb5kdf_settable_ctx_params; +static OSSL_FUNC_kdf_set_ctx_params_fn krb5kdf_set_ctx_params; +static OSSL_FUNC_kdf_gettable_ctx_params_fn krb5kdf_gettable_ctx_params; +static OSSL_FUNC_kdf_get_ctx_params_fn krb5kdf_get_ctx_params; static int KRB5KDF(const EVP_CIPHER *cipher, ENGINE *engine, const unsigned char *key, size_t key_len, diff --git a/providers/implementations/kdfs/pbkdf2.c b/providers/implementations/kdfs/pbkdf2.c index 0f081cc1aa..6ac0783096 100644 --- a/providers/implementations/kdfs/pbkdf2.c +++ b/providers/implementations/kdfs/pbkdf2.c @@ -35,12 +35,12 @@ #define KDF_PBKDF2_MIN_ITERATIONS 1000 #define KDF_PBKDF2_MIN_SALT_LEN (128 / 8) -static OSSL_OP_kdf_newctx_fn kdf_pbkdf2_new; -static OSSL_OP_kdf_freectx_fn kdf_pbkdf2_free; -static OSSL_OP_kdf_reset_fn kdf_pbkdf2_reset; -static OSSL_OP_kdf_derive_fn kdf_pbkdf2_derive; -static OSSL_OP_kdf_settable_ctx_params_fn kdf_pbkdf2_settable_ctx_params; -static OSSL_OP_kdf_set_ctx_params_fn kdf_pbkdf2_set_ctx_params; +static OSSL_FUNC_kdf_newctx_fn kdf_pbkdf2_new; +static OSSL_FUNC_kdf_freectx_fn kdf_pbkdf2_free; +static OSSL_FUNC_kdf_reset_fn kdf_pbkdf2_reset; +static OSSL_FUNC_kdf_derive_fn kdf_pbkdf2_derive; +static OSSL_FUNC_kdf_settable_ctx_params_fn kdf_pbkdf2_settable_ctx_params; +static OSSL_FUNC_kdf_set_ctx_params_fn kdf_pbkdf2_set_ctx_params; static int pbkdf2_derive(const char *pass, size_t passlen, const unsigned char *salt, int saltlen, uint64_t iter, diff --git a/providers/implementations/kdfs/scrypt.c b/providers/implementations/kdfs/scrypt.c index a0a5af1564..77869f957d 100644 --- a/providers/implementations/kdfs/scrypt.c +++ b/providers/implementations/kdfs/scrypt.c @@ -23,12 +23,12 @@ #ifndef OPENSSL_NO_SCRYPT -static OSSL_OP_kdf_newctx_fn kdf_scrypt_new; -static OSSL_OP_kdf_freectx_fn kdf_scrypt_free; -static OSSL_OP_kdf_reset_fn kdf_scrypt_reset; -static OSSL_OP_kdf_derive_fn kdf_scrypt_derive; -static OSSL_OP_kdf_settable_ctx_params_fn kdf_scrypt_settable_ctx_params; -static OSSL_OP_kdf_set_ctx_params_fn kdf_scrypt_set_ctx_params; +static OSSL_FUNC_kdf_newctx_fn kdf_scrypt_new; +static OSSL_FUNC_kdf_freectx_fn kdf_scrypt_free; +static OSSL_FUNC_kdf_reset_fn kdf_scrypt_reset; +static OSSL_FUNC_kdf_derive_fn kdf_scrypt_derive; +static OSSL_FUNC_kdf_settable_ctx_params_fn kdf_scrypt_settable_ctx_params; +static OSSL_FUNC_kdf_set_ctx_params_fn kdf_scrypt_set_ctx_params; static int scrypt_alg(const char *pass, size_t passlen, const unsigned char *salt, size_t saltlen, diff --git a/providers/implementations/kdfs/sshkdf.c b/providers/implementations/kdfs/sshkdf.c index 4ba9a16408..137299235a 100644 --- a/providers/implementations/kdfs/sshkdf.c +++ b/providers/implementations/kdfs/sshkdf.c @@ -22,14 +22,14 @@ # include "prov/provider_util.h" /* See RFC 4253, Section 7.2 */ -static OSSL_OP_kdf_newctx_fn kdf_sshkdf_new; -static OSSL_OP_kdf_freectx_fn kdf_sshkdf_free; -static OSSL_OP_kdf_reset_fn kdf_sshkdf_reset; -static OSSL_OP_kdf_derive_fn kdf_sshkdf_derive; -static OSSL_OP_kdf_settable_ctx_params_fn kdf_sshkdf_settable_ctx_params; -static OSSL_OP_kdf_set_ctx_params_fn kdf_sshkdf_set_ctx_params; -static OSSL_OP_kdf_gettable_ctx_params_fn kdf_sshkdf_gettable_ctx_params; -static OSSL_OP_kdf_get_ctx_params_fn kdf_sshkdf_get_ctx_params; +static OSSL_FUNC_kdf_newctx_fn kdf_sshkdf_new; +static OSSL_FUNC_kdf_freectx_fn kdf_sshkdf_free; +static OSSL_FUNC_kdf_reset_fn kdf_sshkdf_reset; +static OSSL_FUNC_kdf_derive_fn kdf_sshkdf_derive; +static OSSL_FUNC_kdf_settable_ctx_params_fn kdf_sshkdf_settable_ctx_params; +static OSSL_FUNC_kdf_set_ctx_params_fn kdf_sshkdf_set_ctx_params; +static OSSL_FUNC_kdf_gettable_ctx_params_fn kdf_sshkdf_gettable_ctx_params; +static OSSL_FUNC_kdf_get_ctx_params_fn kdf_sshkdf_get_ctx_params; static int SSHKDF(const EVP_MD *evp_md, const unsigned char *key, size_t key_len, diff --git a/providers/implementations/kdfs/sskdf.c b/providers/implementations/kdfs/sskdf.c index 023395b14d..cf5a9e7129 100644 --- a/providers/implementations/kdfs/sskdf.c +++ b/providers/implementations/kdfs/sskdf.c @@ -70,15 +70,15 @@ typedef struct { /* KMAC uses a Customisation string of 'KDF' */ static const unsigned char kmac_custom_str[] = { 0x4B, 0x44, 0x46 }; -static OSSL_OP_kdf_newctx_fn sskdf_new; -static OSSL_OP_kdf_freectx_fn sskdf_free; -static OSSL_OP_kdf_reset_fn sskdf_reset; -static OSSL_OP_kdf_derive_fn sskdf_derive; -static OSSL_OP_kdf_derive_fn x963kdf_derive; -static OSSL_OP_kdf_settable_ctx_params_fn sskdf_settable_ctx_params; -static OSSL_OP_kdf_set_ctx_params_fn sskdf_set_ctx_params; -static OSSL_OP_kdf_gettable_ctx_params_fn sskdf_gettable_ctx_params; -static OSSL_OP_kdf_get_ctx_params_fn sskdf_get_ctx_params; +static OSSL_FUNC_kdf_newctx_fn sskdf_new; +static OSSL_FUNC_kdf_freectx_fn sskdf_free; +static OSSL_FUNC_kdf_reset_fn sskdf_reset; +static OSSL_FUNC_kdf_derive_fn sskdf_derive; +static OSSL_FUNC_kdf_derive_fn x963kdf_derive; +static OSSL_FUNC_kdf_settable_ctx_params_fn sskdf_settable_ctx_params; +static OSSL_FUNC_kdf_set_ctx_params_fn sskdf_set_ctx_params; +static OSSL_FUNC_kdf_gettable_ctx_params_fn sskdf_gettable_ctx_params; +static OSSL_FUNC_kdf_get_ctx_params_fn sskdf_get_ctx_params; /* * Refer to https://csrc.nist.gov/publications/detail/sp/800-56c/rev-1/final diff --git a/providers/implementations/kdfs/tls1_prf.c b/providers/implementations/kdfs/tls1_prf.c index 1b47247cbb..05e394e0b4 100644 --- a/providers/implementations/kdfs/tls1_prf.c +++ b/providers/implementations/kdfs/tls1_prf.c @@ -61,12 +61,12 @@ #include "prov/provider_util.h" #include "e_os.h" -static OSSL_OP_kdf_newctx_fn kdf_tls1_prf_new; -static OSSL_OP_kdf_freectx_fn kdf_tls1_prf_free; -static OSSL_OP_kdf_reset_fn kdf_tls1_prf_reset; -static OSSL_OP_kdf_derive_fn kdf_tls1_prf_derive; -static OSSL_OP_kdf_settable_ctx_params_fn kdf_tls1_prf_settable_ctx_params; -static OSSL_OP_kdf_set_ctx_params_fn kdf_tls1_prf_set_ctx_params; +static OSSL_FUNC_kdf_newctx_fn kdf_tls1_prf_new; +static OSSL_FUNC_kdf_freectx_fn kdf_tls1_prf_free; +static OSSL_FUNC_kdf_reset_fn kdf_tls1_prf_reset; +static OSSL_FUNC_kdf_derive_fn kdf_tls1_prf_derive; +static OSSL_FUNC_kdf_settable_ctx_params_fn kdf_tls1_prf_settable_ctx_params; +static OSSL_FUNC_kdf_set_ctx_params_fn kdf_tls1_prf_set_ctx_params; static int tls1_prf_alg(EVP_MAC_CTX *mdctx, EVP_MAC_CTX *sha1ctx, const unsigned char *sec, size_t slen, diff --git a/providers/implementations/kdfs/x942kdf.c b/providers/implementations/kdfs/x942kdf.c index 1459e0f661..13352638c2 100644 --- a/providers/implementations/kdfs/x942kdf.c +++ b/providers/implementations/kdfs/x942kdf.c @@ -32,14 +32,14 @@ # define X942KDF_MAX_INLEN (1 << 30) -static OSSL_OP_kdf_newctx_fn x942kdf_new; -static OSSL_OP_kdf_freectx_fn x942kdf_free; -static OSSL_OP_kdf_reset_fn x942kdf_reset; -static OSSL_OP_kdf_derive_fn x942kdf_derive; -static OSSL_OP_kdf_settable_ctx_params_fn x942kdf_settable_ctx_params; -static OSSL_OP_kdf_set_ctx_params_fn x942kdf_set_ctx_params; -static OSSL_OP_kdf_gettable_ctx_params_fn x942kdf_gettable_ctx_params; -static OSSL_OP_kdf_get_ctx_params_fn x942kdf_get_ctx_params; +static OSSL_FUNC_kdf_newctx_fn x942kdf_new; +static OSSL_FUNC_kdf_freectx_fn x942kdf_free; +static OSSL_FUNC_kdf_reset_fn x942kdf_reset; +static OSSL_FUNC_kdf_derive_fn x942kdf_derive; +static OSSL_FUNC_kdf_settable_ctx_params_fn x942kdf_settable_ctx_params; +static OSSL_FUNC_kdf_set_ctx_params_fn x942kdf_set_ctx_params; +static OSSL_FUNC_kdf_gettable_ctx_params_fn x942kdf_gettable_ctx_params; +static OSSL_FUNC_kdf_get_ctx_params_fn x942kdf_get_ctx_params; typedef struct { void *provctx; |