[openssl] OpenSSL_1_1_1-stable update
tmraz at fedoraproject.org
tmraz at fedoraproject.org
Wed Oct 9 15:45:37 UTC 2019
The branch OpenSSL_1_1_1-stable has been updated
via f736feeabfe6febdf3c359b6d7fff5e692f9a426 (commit)
from 95e4ee81decfd7c832e499ca99b3e49886fe96c1 (commit)
- Log -----------------------------------------------------------------
commit f736feeabfe6febdf3c359b6d7fff5e692f9a426
Author: Rich Salz <rsalz at akamai.com>
Date: Sat Oct 5 13:48:50 2019 -0400
Fix reference to PEM docs
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10101)
(cherry picked from commit 120cc034271e9ab52f92840a16784228e50564f9)
-----------------------------------------------------------------------
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 3a5bfee996..eb2fb2059e 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 a16b0ede5a..9748e74e0f 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
More information about the openssl-commits
mailing list