Merge OpenSSL 1.0.2h.

Relnotes:	yes

1 files changed, 9 insertions, 1 deletions

diff --git a/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3 b/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3
index a62ace3..12d0d6a 100644
--- a/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3
+++ b/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_use_serverinfo 3"
-.TH SSL_CTX_use_serverinfo 3 "2016-03-01" "1.0.2g" "OpenSSL"
+.TH SSL_CTX_use_serverinfo 3 "2016-05-03" "1.0.2h" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -166,6 +166,14 @@ a 2\-byte length, and then length bytes of extension_data.
 must consist of a 2\-byte Extension Type, a 2\-byte length, and then length
 bytes of extension_data.  Each \s-1PEM\s0 extension name must begin with the phrase
 \&\*(L"\s-1BEGIN SERVERINFO FOR \*(R".\s0
+.PP
+If more than one certificate (\s-1RSA/DSA\s0) is installed using
+\&\fISSL_CTX_use_certificate()\fR, the serverinfo extension will be loaded into the
+last certificate installed.  If e.g. the last item was a \s-1RSA\s0 certificate, the
+loaded serverinfo extension data will be loaded for that certificate.  To
+use the serverinfo extension for multiple certificates,
+\&\fISSL_CTX_use_serverinfo()\fR needs to be called multiple times, once \fBafter\fR
+each time a certificate is loaded.
 .SH "NOTES"
 .IX Header "NOTES"
 .SH "RETURN VALUES"