summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2022-05-09 21:00:03 +0200
committerDr. David von Oheimb <dev@ddvo.net>2022-06-28 17:51:21 +0200
commite2f6960fc5fe1d6eb2178adf51db1ed206ff9e90 (patch)
treebc336323cf198db2c004e7490bbf47e24fe23740 /util
parent61f510600e2c7cdee6e61f8b7075fb0e939eb179 (diff)
CMS: Export CMS_EnvelopedData and add CMS_EnvelopedData_decrypt()
Also document CMS_decrypt_set1_password() and fix CMS_EnvelopedData_create.pod. Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com> (Merged from https://github.com/openssl/openssl/pull/18301)
Diffstat (limited to 'util')
-rw-r--r--util/libcrypto.num2
-rw-r--r--util/missingcrypto.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num
index dcd9d02924..cb0d48cfca 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -5438,5 +5438,7 @@ ASYNC_set_mem_functions ? 3_1_0 EXIST::FUNCTION:
ASYNC_get_mem_functions ? 3_1_0 EXIST::FUNCTION:
BIO_ADDR_dup ? 3_1_0 EXIST::FUNCTION:SOCK
CMS_final_digest ? 3_1_0 EXIST::FUNCTION:CMS
+CMS_EnvelopedData_it ? 3_1_0 EXIST::FUNCTION:CMS
+CMS_EnvelopedData_decrypt ? 3_1_0 EXIST::FUNCTION:CMS
OPENSSL_strcasecmp ? 3_0_3 EXIST::FUNCTION:
OPENSSL_strncasecmp ? 3_0_3 EXIST::FUNCTION:
diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt
index b93a081f6d..a0937d4d98 100644
--- a/util/missingcrypto.txt
+++ b/util/missingcrypto.txt
@@ -328,7 +328,6 @@ CMS_data(3)
CMS_dataFinal(3)
CMS_dataInit(3)
CMS_decrypt_set1_key(3)
-CMS_decrypt_set1_password(3)
CMS_digest_verify(3)
CMS_is_detached(3)
CMS_set1_signers_certs(3)