The branch master has been updated via 120cc034271e9ab52f92840a16784228e50564f9 (commit) from 6f02932edba62186a6866e8c9f0f0714674f6bab (commit)
- Log ----------------------------------------------------------------- commit 120cc034271e9ab52f92840a16784228e50564f9 Author: Rich Salz <rs...@akamai.com> Date: Sat Oct 5 13:48:50 2019 -0400 Fix reference to PEM docs Reviewed-by: Richard Levitte <levi...@openssl.org> Reviewed-by: Tomas Mraz <tm...@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/10101) ----------------------------------------------------------------------- Summary of changes: doc/man3/PEM_bytes_read_bio.pod | 4 ++-- doc/man3/PEM_read_bio_ex.pod | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/man3/PEM_bytes_read_bio.pod b/doc/man3/PEM_bytes_read_bio.pod index dccab4b08b..c2cdf6cd10 100644 --- a/doc/man3/PEM_bytes_read_bio.pod +++ b/doc/man3/PEM_bytes_read_bio.pod @@ -17,7 +17,8 @@ PEM_bytes_read_bio, PEM_bytes_read_bio_secmem - read a PEM-encoded data structur =head1 DESCRIPTION -PEM_bytes_read_bio() reads PEM-formatted (RFC 1421) data from the BIO +PEM_bytes_read_bio() reads PEM-formatted (IETF RFC 1421 and IETF RFC 7468) +data from the BIO I<bp> for the data type given in I<name> (RSA PRIVATE KEY, CERTIFICATE, etc.). If multiple PEM-encoded data structures are present in the same stream, PEM_bytes_read_bio() will skip non-matching data types and @@ -66,7 +67,6 @@ PEM_bytes_read_bio() and PEM_bytes_read_bio_secmem() return 1 for success or =head1 SEE ALSO -L<PEM(3)>, L<PEM_read_bio_ex(3)>, L<passphrase-encoding(7)> diff --git a/doc/man3/PEM_read_bio_ex.pod b/doc/man3/PEM_read_bio_ex.pod index 761fe2c0a5..83d16af10a 100644 --- a/doc/man3/PEM_read_bio_ex.pod +++ b/doc/man3/PEM_read_bio_ex.pod @@ -52,7 +52,7 @@ PEM_read_bio_ex() returns 1 for success or 0 for failure. =head1 SEE ALSO -L<PEM(3)> +L<PEM_bytes_read_bio(3)> =head1 HISTORY