[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6783944f89a606e09e961d473b70167d2a66f96e (commit)
      from  5b3accde606ffe01466426bd59407ffca0690d23 (commit)


- Log -----------------------------------------------------------------
commit 6783944f89a606e09e961d473b70167d2a66f96e
Author: David Makepeace <david.p.makepeace at oracle.com>
Date:   Mon May 27 08:21:50 2019 +1000

    Added Conforming To section to EVP_KDF_TLS1_PRF documentation.
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9008)

-----------------------------------------------------------------------

Summary of changes:
 doc/man7/EVP_KDF_TLS1_PRF.pod | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/man7/EVP_KDF_TLS1_PRF.pod b/doc/man7/EVP_KDF_TLS1_PRF.pod
index e6cbe09..4c73139 100644
--- a/doc/man7/EVP_KDF_TLS1_PRF.pod
+++ b/doc/man7/EVP_KDF_TLS1_PRF.pod
@@ -121,6 +121,10 @@ and seed value "seed":
  }
  EVP_KDF_CTX_free(kctx);
 
+=head1 CONFORMING TO
+
+RFC 2246, RFC 5246 and NIST SP 800-135 r1
+
 =head1 SEE ALSO
 
 L<EVP_KDF_CTX>,