summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2021-02-05 08:45:39 +0100
committerShane Lontis <shane.lontis@oracle.com>2021-02-10 01:28:32 +0100
commit8a686bdb3ac7d61b6d5f02b9132c4878ae80a7e5 (patch)
treec82f6f791129ae7cff64d7031544eaefaaaff3c9 /include
parentx509_vfy.c: Sort out return values 0 vs. -1 (failure/internal error) (diff)
downloadopenssl-8a686bdb3ac7d61b6d5f02b9132c4878ae80a7e5.tar.xz
openssl-8a686bdb3ac7d61b6d5f02b9132c4878ae80a7e5.zip
Change the ASN1 variant of x942kdf so that it can test acvp data.
This 'special' way of specifying the data should only be used for testing purposes. It should not be used in production environments. ACVP passes a blob of DER encoded data for some of the fields rather than passing them as separate fields that need to be DER encoded. Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14077)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/core_names.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h
index 07b95e043b..221d67b823 100644
--- a/include/openssl/core_names.h
+++ b/include/openssl/core_names.h
@@ -203,6 +203,7 @@ extern "C" {
#define OSSL_KDF_PARAM_PKCS12_ID "id" /* int */
#define OSSL_KDF_PARAM_KBKDF_USE_L "use-l" /* int */
#define OSSL_KDF_PARAM_KBKDF_USE_SEPARATOR "use-separator" /* int */
+#define OSSL_KDF_PARAM_X942_ACVPINFO "acvp-info"
#define OSSL_KDF_PARAM_X942_PARTYUINFO "partyu-info"
#define OSSL_KDF_PARAM_X942_PARTYVINFO "partyv-info"
#define OSSL_KDF_PARAM_X942_SUPP_PUBINFO "supp-pubinfo"