diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2019-11-12 16:59:23 +0100 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2019-11-14 17:26:16 +0100 |
| commit | a90311fead3d8e5178637f2d284fad95a47c281c (patch) | |
| tree | 597c2dc341ec20813181368e1f041955abd60ebc /doc | |
| parent | f3d0c92b425523a5e0e751f51986fd15fc59acd6 (diff) | |
A few fixes in the EVP_KDF-KB and EVP_KDF-KRB5KDF manpages
The context and label is info and salt respectively - fix
the example in KB manpage for that.
There are some typos and bug in EVP_KDF_derive call in the
KRB5KDF example.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10426)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man7/EVP_KDF-KB.pod | 8 | ||||
| -rw-r--r-- | doc/man7/EVP_KDF-KRB5KDF.pod | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/doc/man7/EVP_KDF-KB.pod b/doc/man7/EVP_KDF-KB.pod index 8a079b2358..bbfd56304c 100644 --- a/doc/man7/EVP_KDF-KB.pod +++ b/doc/man7/EVP_KDF-KB.pod @@ -86,9 +86,9 @@ Label "label", and Context "context". *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, "secret", strlen("secret")) *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT, - "context", strlen("context")); - *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, "label", strlen("label")); + *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, + "context", strlen("context")); *p = OSSL_PARAM_construct_end(); if (EVP_KDF_CTX_set_params(kctx, params) <= 0) error("EVP_KDF_CTX_set_params"); @@ -116,9 +116,9 @@ Label "label", and IV "sixteen bytes iv". *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, "secret", strlen("secret")); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT, - "context", strlen("context")); - *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, "label", strlen("label")); + *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, + "context", strlen("context")); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SEED, iv, strlen(iv)); *p = OSSL_PARAM_construct_end(); diff --git a/doc/man7/EVP_KDF-KRB5KDF.pod b/doc/man7/EVP_KDF-KRB5KDF.pod index 6291a11d37..1ac06c493e 100644 --- a/doc/man7/EVP_KDF-KRB5KDF.pod +++ b/doc/man7/EVP_KDF-KRB5KDF.pod @@ -24,7 +24,7 @@ The supported parameters are: =over 4 -=item "properies" (B<OSSL_KDF_PARAM_PROPERTIES>) <UTF8 string> +=item "properties" (B<OSSL_KDF_PARAM_PROPERTIES>) <UTF8 string> =item "cipher" (B<OSSL_KDF_PARAM_CIPHER>) <UTF8 string> @@ -84,9 +84,10 @@ This example derives a key using the AES-128-CBC cipher: if (EVP_KDF_set_params(kctx, params) <= 0) /* Error */ - if (EVP_KDF_derive(kctx, out, &outlen) <= 0) + if (EVP_KDF_derive(kctx, out, outlen) <= 0) /* Error */ + EVP_KDF_CTX_free(kctx); =head1 CONFORMING TO |