summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJordan Montgomery <montytyper@msn.com>2020-10-01 23:02:52 -0700
committerDmitry Belyavskiy <beldmit@gmail.com>2020-10-08 13:26:44 +0300
commitdb554ae1104eb5d3279ca338f58a42be61155f2f (patch)
treeac98c8da596cc799963c473084050aeabc7ad160 /include
parentb19b983017f3865b1b3411a4e635a670d5798774 (diff)
Expose PKCS7_get_octet_string and PKCS7_type_is_other
Add PKCS7_get_octet_string() and PKCS7_type_is_other() to the public interface. Fixes #11139 Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/13059)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/pkcs7.h.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/openssl/pkcs7.h.in b/include/openssl/pkcs7.h.in
index e6ee6df100..f612e363ad 100644
--- a/include/openssl/pkcs7.h.in
+++ b/include/openssl/pkcs7.h.in
@@ -262,6 +262,7 @@ DECLARE_ASN1_PRINT_FUNCTION(PKCS7)
long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg);
+int PKCS7_type_is_other(PKCS7 *p7);
int PKCS7_set_type(PKCS7 *p7, int type);
int PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other);
int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data);
@@ -297,6 +298,7 @@ int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher);
int PKCS7_stream(unsigned char ***boundary, PKCS7 *p7);
PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx);
+ASN1_OCTET_STRING *PKCS7_get_octet_string(PKCS7 *p7);
ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk);
int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int type,
void *data);