[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

Kurt Roeckx kurt at openssl.org
Mon Nov 7 20:14:42 UTC 2016

The branch OpenSSL_1_1_0-stable has been updated
       via  28304b1239eb67c5204a6c80cc5b50f715167140 (commit)
      from  b9ddc5fd0ccb6ec92b5178db1f169d431f2a3ff3 (commit)

- Log -----------------------------------------------------------------
commit 28304b1239eb67c5204a6c80cc5b50f715167140
Author: Andrea Grandi <andrea.grandi at intel.com>
Date:   Thu Nov 3 04:42:07 2016 +0000

    Improve PRF documentation
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    GH: #1834
    (cherry picked from commit 27ed73a98f88c98be996a6ffe7bda1b84bfc8be7)


Summary of changes:
 doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod b/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod
index 0d57f9f..f1f0ae4 100644
--- a/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod
+++ b/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod
@@ -13,14 +13,14 @@ TLS PRF key derivation algorithm
  int EVP_PKEY_CTX_set_tls1_prf_md(EVP_PKEY_CTX *pctx, const EVP_MD *md);
  int EVP_PKEY_CTX_set1_tls1_prf_secret(EVP_PKEY_CTX *pctx,
                                        unsigned char *sec, int seclen);
- int EVP_PKEY_CTX_add1_tls1_prf_seed(EVP_PKEY_CTX *pctx, seed, seedlen)
+ int EVP_PKEY_CTX_add1_tls1_prf_seed(EVP_PKEY_CTX *pctx,
                                      unsigned char *seed, int seedlen);
 The B<EVP_PKEY_TLS1_PRF> algorithm implements the PRF key derivation function for
 TLS. It has no associated private key and only implements key derivation
-using EVP_PKEY_derive().
+using L<EVP_PKEY_derive(3)>.
 EVP_PKEY_set_tls1_prf_md() sets the message digest associated with the
 TLS PRF. EVP_md5_sha1() is treated as a special case which uses the PRF

More information about the openssl-commits mailing list