diff options
author | Enji Cooper <ngie@FreeBSD.org> | 2023-03-01 04:21:31 +0000 |
---|---|---|
committer | Enji Cooper <ngie@FreeBSD.org> | 2023-03-06 20:41:29 +0000 |
commit | e4520c8bd1d300a7a338d0ed4af171a2d0e583ef (patch) | |
tree | 26fed32699a59a50cfbc90a2eb4dac39b498d9ae /doc/man3/SMIME_read_CMS.pod | |
parent | 3c320f4e5ee3d575d48eee7edddbafa059bce3c9 (diff) |
openssl: Vendor import of OpenSSL-3.0.8vendor/openssl/3.0.8
Summary:
Release notes can be found at
https://www.openssl.org/news/openssl-3.0-notes.html .
Obtained from: https://www.openssl.org/source/openssl-3.0.8.tar.gz
Differential Revision: https://reviews.freebsd.org/D38835
Test Plan:
```
$ git status
On branch vendor/openssl-3.0
nothing to commit, working tree clean
$ (cd ..; fetch http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz.asc)
openssl-3.0.8.tar.gz 14 MB 4507 kBps 04s
openssl-3.0.8.tar.gz.asc 833 B 10 MBps 00s
$ set | egrep '(XLIST|OSSLVER)='
OSSLVER=3.0.8
XLIST=FREEBSD-Xlist
$ gpg --list-keys
/home/ngie/.gnupg/pubring.kbx
-----------------------------
pub rsa4096 2014-10-04 [SC]
7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C
uid [ unknown] Richard Levitte <richard@levitte.org>
uid [ unknown] Richard Levitte <levitte@lp.se>
uid [ unknown] Richard Levitte <levitte@openssl.org>
sub rsa4096 2014-10-04 [E]
$ gpg --verify openssl-${OSSLVER}.tar.gz.asc openssl-${OSSLVER}.tar.gz
gpg: Signature made Tue Feb 7 05:43:55 2023 PST
gpg: using RSA key 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C
gpg: Good signature from "Richard Levitte <richard@levitte.org>" [unknown]
gpg: aka "Richard Levitte <levitte@lp.se>" [unknown]
gpg: aka "Richard Levitte <levitte@openssl.org>" [unknown]
gpg: WARNING: This key is not certified with a trusted signature!
gpg: There is no indication that the signature belongs to the owner.
Primary key fingerprint: 7953 AC1F BC3D C8B3 B292 393E D5E9 E43F 7DF9 EE8C
$ (cd vendor.checkout/; git status; find . -type f -or -type l | cut -c 3- | sort > ../old)
On branch vendor/openssl-3.0
nothing to commit, working tree clean
$ tar -x -X $XLIST -f ../openssl-${OSSLVER}.tar.gz -C ..
$ rsync --exclude FREEBSD.* --delete -avzz ../openssl-${OSSLVER}/* .
$ cat .git
gitdir: /home/ngie/git/freebsd-src/.git/worktrees/vendor.checkout
$ diff -arq ../openssl-3.0.8 .
Only in .: .git
Only in .: FREEBSD-Xlist
Only in .: FREEBSD-upgrade
$ git status FREEBSD*
On branch vendor/openssl-3.0
nothing to commit, working tree clean
$
```
Reviewers: emaste, jkim
Subscribers: imp, andrew, dab
Differential Revision: https://reviews.freebsd.org/D38835
Diffstat (limited to 'doc/man3/SMIME_read_CMS.pod')
-rw-r--r-- | doc/man3/SMIME_read_CMS.pod | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/doc/man3/SMIME_read_CMS.pod b/doc/man3/SMIME_read_CMS.pod index 800e4aa25f3c..733d26078a74 100644 --- a/doc/man3/SMIME_read_CMS.pod +++ b/doc/man3/SMIME_read_CMS.pod @@ -2,12 +2,14 @@ =head1 NAME -SMIME_read_CMS - parse S/MIME message +SMIME_read_CMS_ex, SMIME_read_CMS - parse S/MIME message =head1 SYNOPSIS #include <openssl/cms.h> + CMS_ContentInfo *SMIME_read_CMS_ex(BIO *bio, int flags, BIO **bcont, + CMS_ContentInfo **cms); CMS_ContentInfo *SMIME_read_CMS(BIO *in, BIO **bcont); =head1 DESCRIPTION @@ -22,6 +24,15 @@ written to B<*bcont>, otherwise B<*bcont> is set to NULL. The parsed CMS_ContentInfo structure is returned or NULL if an error occurred. +SMIME_read_CMS_ex() is similar to SMIME_read_CMS() but optionally a previously +created I<cms> CMS_ContentInfo object can be supplied as well as some I<flags>. +To create a I<cms> object use L<CMS_ContentInfo_new_ex(3)>. +If the I<flags> argument contains B<CMS_BINARY> then the input is assumed to be +in binary format and is not translated to canonical form. +If in addition B<SMIME_ASCIICRLF> is set then the binary input is assumed +to be followed by B<CR> and B<LF> characters, else only by an B<LF> character. +If I<flags> is 0 and I<cms> is NULL then it is identical to SMIME_read_CMS(). + =head1 NOTES If B<*bcont> is not NULL then the message is clear text signed. B<*bcont> can @@ -53,21 +64,27 @@ should be available. =head1 RETURN VALUES -SMIME_read_CMS() returns a valid B<CMS_ContentInfo> structure or B<NULL> -if an error occurred. The error can be obtained from ERR_get_error(3). +SMIME_read_CMS_ex() and SMIME_read_CMS() return a valid B<CMS_ContentInfo> +structure or B<NULL> if an error occurred. The error can be obtained from +ERR_get_error(3). =head1 SEE ALSO -L<ERR_get_error(3)>, L<CMS_type(3)>, -L<SMIME_read_CMS(3)>, L<CMS_sign(3)>, -L<CMS_verify(3)>, L<CMS_encrypt(3)>, +L<ERR_get_error(3)>, +L<CMS_sign(3)>, +L<CMS_verify(3)>, +L<CMS_encrypt(3)>, L<CMS_decrypt(3)> +=head1 HISTORY + +The function SMIME_read_CMS_ex() was added in OpenSSL 3.0. + =head1 COPYRIGHT -Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved. -Licensed under the OpenSSL license (the "License"). You may not use +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 in the file LICENSE in the source distribution or at L<https://www.openssl.org/source/license.html>. |