diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-09-22 15:45:17 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-09-23 17:31:40 +1000 |
| commit | 26496f5a5cc44f3250198d22b353403a54f5e29b (patch) | |
| tree | a712876eefc584a8a79a7d115a673e61fc266502 /doc | |
| parent | 719523c76df0850ba736ede48cc86d48eed9f725 (diff) | |
Fix EVP_KDF_scrypt so that is uses a propq for its fetch.
The parameter can be set via settable parameter OSSL_KDF_PARAM_PROPERTIES
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12944)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man7/EVP_KDF-SCRYPT.pod | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/doc/man7/EVP_KDF-SCRYPT.pod b/doc/man7/EVP_KDF-SCRYPT.pod index 8650a8b39a..ec4eab8f1c 100644 --- a/doc/man7/EVP_KDF-SCRYPT.pod +++ b/doc/man7/EVP_KDF-SCRYPT.pod @@ -55,10 +55,17 @@ These parameters work as described in L<EVP_KDF(3)/PARAMETERS>. =item "p" (B<OSSL_KDF_PARAM_SCRYPT_P>) <unsigned integer> -These parameters configure the scrypt work factors N, r and p. -N is a parameter of type B<uint64_t>. +=item "maxmem_bytes" (B<OSSL_KDF_PARAM_SCRYPT_MAXMEM>) <unsigned integer> + +These parameters configure the scrypt work factors N, r, maxmem and p. +Both N and maxmem_bytes are parameters of type B<uint64_t>. Both r and p are parameters of type B<uint32_t>. +=item "properties" (B<OSSL_KDF_PARAM_PROPERTIES>) <UTF8 string> + +This can be used to set the property query string when fetching the +fixed digest internally. NULL is used if this value is not set. + =back =head1 NOTES |