summaryrefslogtreecommitdiff
path: root/include/openssl
diff options
context:
space:
mode:
Diffstat (limited to 'include/openssl')
-rw-r--r--include/openssl/core_names.h6
-rw-r--r--include/openssl/proverr.h2
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