diff options
| author | Pauli <paul.dale@oracle.com> | 2020-09-30 13:59:20 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-10-01 11:25:12 +1000 |
| commit | 012903063900340b972a6a8d20c0a18c37a89428 (patch) | |
| tree | 663ae5a236d1f0a6514a6d8700ea0327f6e978d8 /providers/implementations/kdfs | |
| parent | a55b00bdbc00b1632e551cf71bce72137e683c12 (diff) | |
der: _ossl prefix der_oid_ and der_aid_ functions
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13038)
Diffstat (limited to 'providers/implementations/kdfs')
| -rw-r--r-- | providers/implementations/kdfs/x942kdf.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/providers/implementations/kdfs/x942kdf.c b/providers/implementations/kdfs/x942kdf.c index 20aa2c42cd..3377350bf3 100644 --- a/providers/implementations/kdfs/x942kdf.c +++ b/providers/implementations/kdfs/x942kdf.c @@ -58,12 +58,15 @@ static const struct { size_t oid_len; size_t keklen; /* size in bytes */ } kek_algs[] = { - { "AES-128-WRAP", der_oid_id_aes128_wrap, DER_OID_SZ_id_aes128_wrap, 16 }, - { "AES-192-WRAP", der_oid_id_aes192_wrap, DER_OID_SZ_id_aes192_wrap, 24 }, - { "AES-256-WRAP", der_oid_id_aes256_wrap, DER_OID_SZ_id_aes256_wrap, 32 }, -#ifndef FIPS_MODULE - { "DES3-WRAP", der_oid_id_alg_CMS3DESwrap, DER_OID_SZ_id_alg_CMS3DESwrap, + { "AES-128-WRAP", ossl_der_oid_id_aes128_wrap, DER_OID_SZ_id_aes128_wrap, + 16 }, + { "AES-192-WRAP", ossl_der_oid_id_aes192_wrap, DER_OID_SZ_id_aes192_wrap, 24 }, + { "AES-256-WRAP", ossl_der_oid_id_aes256_wrap, DER_OID_SZ_id_aes256_wrap, + 32 }, +#ifndef FIPS_MODULE + { "DES3-WRAP", ossl_der_oid_id_alg_CMS3DESwrap, + DER_OID_SZ_id_alg_CMS3DESwrap, 24 }, #endif }; |