diff options
| author | Čestmír Kalina <ckalina@redhat.com> | 2021-09-27 22:45:38 +0200 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-03-17 11:12:47 +1100 |
| commit | 6dfa998f7ea150f9c6d4e4727cf6d5c82a68a8da (patch) | |
| tree | 3d9fcb93c1e3bd8b55f661e09fa30ac519b74368 /include/openssl | |
| parent | 0e200d2a19185dab9d73eee90bd6cd0246416a9e (diff) | |
| download | openssl-new-6dfa998f7ea150f9c6d4e4727cf6d5c82a68a8da.tar.gz | |
providers: add Argon2 KDF
https://datatracker.ietf.org/doc/rfc9106/
Signed-off-by: Čestmír Kalina <ckalina@redhat.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12256)
Diffstat (limited to 'include/openssl')
| -rw-r--r-- | include/openssl/core_names.h | 6 | ||||
| -rw-r--r-- | include/openssl/proverr.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h index 5e5be567a5..0d07efcedc 100644 --- a/include/openssl/core_names.h +++ b/include/openssl/core_names.h @@ -233,6 +233,12 @@ extern "C" { #define OSSL_KDF_PARAM_X942_USE_KEYBITS "use-keybits" #define OSSL_KDF_PARAM_HMACDRBG_ENTROPY "entropy" #define OSSL_KDF_PARAM_HMACDRBG_NONCE "nonce" +#define OSSL_KDF_PARAM_THREADS "threads" /* uint32_t */ +#define OSSL_KDF_PARAM_EARLY_CLEAN "early_clean" /* uint32_t */ +#define OSSL_KDF_PARAM_ARGON2_AD "ad" /* octet string */ +#define OSSL_KDF_PARAM_ARGON2_LANES "lanes" /* uint32_t */ +#define OSSL_KDF_PARAM_ARGON2_MEMCOST "memcost" /* uint32_t */ +#define OSSL_KDF_PARAM_ARGON2_VERSION "version" /* uint32_t */ /* Known KDF names */ #define OSSL_KDF_NAME_HKDF "HKDF" diff --git a/include/openssl/proverr.h b/include/openssl/proverr.h index d36b3916fb..d9ef56815c 100644 --- a/include/openssl/proverr.h +++ b/include/openssl/proverr.h @@ -68,7 +68,7 @@ # define PROV_R_INVALID_KEY 158 # define PROV_R_INVALID_KEY_LENGTH 105 # define PROV_R_INVALID_MAC 151 -# define PROV_R_INVALID_MEMORY_SIZE 233 +# define PROV_R_INVALID_MEMORY_SIZE 235 # define PROV_R_INVALID_MGF1_MD 167 # define PROV_R_INVALID_MODE 125 # define PROV_R_INVALID_OUTPUT_LENGTH 217 |