diff options
| author | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-01-21 15:04:42 +0300 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-03-03 16:34:40 +0300 |
| commit | 348900774c14dd79c9cf762d59554f38d8c77120 (patch) | |
| tree | 6620721a8bee685fc501e891681e4f235e8613f1 /doc/man3/CMS_get0_RecipientInfos.pod | |
| parent | 71434aed0de274abe8f10768c4dd11a5b3b387e4 (diff) | |
Documenting newly added CMS modification
Documented CMS-related API functions.
Documented flags added to openssl-cms command
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10904)
Diffstat (limited to 'doc/man3/CMS_get0_RecipientInfos.pod')
| -rw-r--r-- | doc/man3/CMS_get0_RecipientInfos.pod | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/doc/man3/CMS_get0_RecipientInfos.pod b/doc/man3/CMS_get0_RecipientInfos.pod index 5d19e3d178..c6354381fc 100644 --- a/doc/man3/CMS_get0_RecipientInfos.pod +++ b/doc/man3/CMS_get0_RecipientInfos.pod @@ -5,6 +5,8 @@ CMS_get0_RecipientInfos, CMS_RecipientInfo_type, CMS_RecipientInfo_ktri_get0_signer_id, CMS_RecipientInfo_ktri_cert_cmp, CMS_RecipientInfo_set0_pkey, CMS_RecipientInfo_kekri_get0_id, +CMS_RecipientInfo_kari_set0_pkey_and_peer, +CMS_RecipientInfo_kari_set0_pkey, CMS_RecipientInfo_kekri_id_cmp, CMS_RecipientInfo_set0_key, CMS_RecipientInfo_decrypt, CMS_RecipientInfo_encrypt - CMS envelopedData RecipientInfo routines @@ -22,7 +24,9 @@ CMS_RecipientInfo_decrypt, CMS_RecipientInfo_encrypt ASN1_INTEGER **sno); int CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert); int CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey); - + int CMS_RecipientInfo_kari_set0_pkey_and_peer(CMS_RecipientInfo *ri, + EVP_PKEY *pk, X509 *peer); + int CMS_RecipientInfo_kari_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pk); int CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri, X509_ALGOR **palg, ASN1_OCTET_STRING **pid, ASN1_GENERALIZEDTIME **pdate, @@ -58,6 +62,13 @@ CMS_RecipientInfo_set0_pkey() associates the private key B<pkey> with the CMS_RecipientInfo structure B<ri>, which must be of type CMS_RECIPINFO_TRANS. +CMS_RecipientInfo_kari_set0_pkey_and_peer() associates the private key B<pkey> +and peer certificate B<peer> with the CMS_RecipientInfo structure B<ri>, which +must be of type CMS_RECIPINFO_AGREE. + +CMS_RecipientInfo_kari_set0_pkey() associates the private key B<pkey> with the +CMS_RecipientInfo structure B<ri>, which must be of type CMS_RECIPINFO_AGREE. + CMS_RecipientInfo_kekri_get0_id() retrieves the key information from the CMS_RecipientInfo structure B<ri> which must be of type CMS_RECIPINFO_KEK. Any of the remaining parameters can be NULL if the application is not interested in @@ -127,9 +138,14 @@ Any error can be obtained from L<ERR_get_error(3)>. L<ERR_get_error(3)>, L<CMS_decrypt(3)> +=head1 HISTORY + +B<CMS_RecipientInfo_kari_set0_pkey_and_peer> and B<CMS_RecipientInfo_kari_set0_pkey> +were added in OpenSSL 3.0. + =head1 COPYRIGHT -Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy |