diff options
| author | Pauli <paul.dale@oracle.com> | 2019-09-02 13:58:42 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-09-06 19:27:57 +1000 |
| commit | b4dca02940ce040305a9ca95896ccb65f43ec29c (patch) | |
| tree | 4ffdfd1cf334a1100ca369cd68392a1a2f6d1036 /doc | |
| parent | ccd7115a4158a34008975ae83c3a733ba0be9911 (diff) | |
Update KDF documentation (section 1)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9662)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man1/openssl-kdf.pod | 14 | ||||
| -rw-r--r-- | doc/man1/openssl-list.pod | 10 |
2 files changed, 15 insertions, 9 deletions
diff --git a/doc/man1/openssl-kdf.pod b/doc/man1/openssl-kdf.pod index e85157104e..a2b0f25d25 100644 --- a/doc/man1/openssl-kdf.pod +++ b/doc/man1/openssl-kdf.pod @@ -144,13 +144,13 @@ used when building OpenSSL. L<openssl(1)>, L<openssl-pkeyutl(1)> -L<EVP_KDF_CTX(3)>, -L<EVP_KDF_SCRYPT(7)> -L<EVP_KDF_TLS1_PRF(7)> -L<EVP_KDF_PBKDF2(7)> -L<EVP_KDF_HKDF(7)> -L<EVP_KDF_SS(7)> -L<EVP_KDF_SSHKDF(7)> +L<EVP_KDF(3)>, +L<EVP_KDF-SCRYPT(7)> +L<EVP_KDF-TLS1_PRF(7)> +L<EVP_KDF-PBKDF2(7)> +L<EVP_KDF-HKDF(7)> +L<EVP_KDF-SS(7)> +L<EVP_KDF-SSHKDF(7)> =head1 HISTORY diff --git a/doc/man1/openssl-list.pod b/doc/man1/openssl-list.pod index a098f26605..28daa80ead 100644 --- a/doc/man1/openssl-list.pod +++ b/doc/man1/openssl-list.pod @@ -13,6 +13,7 @@ B<openssl list> [B<-commands>] [B<-digest-commands>] [B<-digest-algorithms>] +[B<-kdf-algorithms>] [B<-mac-algorithms>] [B<-cipher-commands>] [B<-cipher-algorithms>] @@ -64,6 +65,12 @@ B<bar>. In verbose mode, the algorithms provided by a provider will get additional information on what parameters each implementation supports. +=item B<-kdf-algorithms> + +Display a list of key derivation function algorithms. +If a line is of the form C<foo =E<gt> bar> then B<foo> is an alias for the +official algorithm name, B<bar>. + =item B<-mac-algorithms> Display a list of message authentication code algorithms. @@ -93,8 +100,7 @@ a block of multiple lines, all but the first are indented. =item B<-public-key-methods> -Display a list of public key method OIDs: this also includes public key methods -without an associated ASN.1 method, for example, KDF algorithms. +Display a list of public key method OIDs. =item B<-engines> |