[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  95e040bb2b36aeee61262cc2fdc50c57dd0b863a (commit)
      from  ec59112a822e16a539bc5dd1b8bed12afbcb82b8 (commit)


- Log -----------------------------------------------------------------
commit 95e040bb2b36aeee61262cc2fdc50c57dd0b863a
Author: Rich Salz <rsalz at akamai.com>
Date:   Sat Mar 5 01:13:58 2016 -0500

    Fix pkeyutl to KDF lnks.
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

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

Summary of changes:
 doc/apps/pkeyutl.pod         | 2 +-
 doc/crypto/EVP_PKEY_HKDF.pod | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/apps/pkeyutl.pod b/doc/apps/pkeyutl.pod
index 1c8e83f..fed683f 100644
--- a/doc/apps/pkeyutl.pod
+++ b/doc/apps/pkeyutl.pod
@@ -263,7 +263,7 @@ Derive a shared secret value:
  openssl pkeyutl -derive -inkey key.pem -peerkey pubkey.pem -out secret
 
 Hexdump 48 bytes of TLS1 PRF using digest B<SHA256> and shared secret and
-seed consisting of the single byte 0xFF.
+seed consisting of the single byte 0xFF:
 
  openssl pkeyutl -kdf TLS1-PRF -kdflen 48 -pkeyopt md:SHA256 \
     -pkeyopt hexsecret:ff -pkeyopt hexseed:ff -hexdump
diff --git a/doc/crypto/EVP_PKEY_HKDF.pod b/doc/crypto/EVP_PKEY_HKDF.pod
index 00c0a76..8a5ef98 100644
--- a/doc/crypto/EVP_PKEY_HKDF.pod
+++ b/doc/crypto/EVP_PKEY_HKDF.pod
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-EVP_PKEY_HKDF; EVP_PKEY_CTX_set_hkdf_md, EVP_PKEY_CTX_set1_hkdf_salt,
+EVP_PKEY_HKDF, EVP_PKEY_CTX_set_hkdf_md, EVP_PKEY_CTX_set1_hkdf_salt,
 EVP_PKEY_CTX_set1_hkdf_key, EVP_PKEY_CTX_add1_hkdf_info -
 HMAC-based Extract-and-Expand key derivation algorithm