diff options
| author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-09-14 00:47:26 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-09-23 23:15:46 +0200 |
| commit | b0614f0ae3c33182ad184dc82056b22aebf42956 (patch) | |
| tree | ec3c7feddce2c7dae939daae1062381d57ce6e9a /doc/man7 | |
| parent | 0ce47b35c7e6b6b82cfd86ec05b786338b8879c2 (diff) | |
drbg: revert renamings of the generate and reseed counter
The original names were more intuitive: the generate_counter counts the
number of generate requests, and the reseed_counter counts the number
of reseedings (of the principal DRBG).
reseed_gen_counter -> generate_counter
reseed_prop_counter -> reseed_counter
This is the anologue to commit 8380f453ec81 on the 1.1.1 stable branch.
The only difference is that the second renaming has already been reverted
on the master branch.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12941)
Diffstat (limited to 'doc/man7')
| -rw-r--r-- | doc/man7/EVP_RAND-CTR-DRBG.pod | 2 | ||||
| -rw-r--r-- | doc/man7/EVP_RAND-HASH-DRBG.pod | 2 | ||||
| -rw-r--r-- | doc/man7/EVP_RAND-HMAC-DRBG.pod | 2 | ||||
| -rw-r--r-- | doc/man7/EVP_RAND-TEST-RAND.pod | 2 | ||||
| -rw-r--r-- | doc/man7/provider-rand.pod | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/doc/man7/EVP_RAND-CTR-DRBG.pod b/doc/man7/EVP_RAND-CTR-DRBG.pod index e35703670f..d8e2d4f2aa 100644 --- a/doc/man7/EVP_RAND-CTR-DRBG.pod +++ b/doc/man7/EVP_RAND-CTR-DRBG.pod @@ -42,7 +42,7 @@ The supported parameters are: =item "max_adinlen" (B<OSSL_DRBG_PARAM_MAX_ADINLEN>) <unsigned integer> -=item "reseed_counter" (B<OSSL_DRBG_PARAM_RESEED_CTR>) <unsigned integer> +=item "reseed_counter" (B<OSSL_DRBG_PARAM_RESEED_COUNTER>) <unsigned integer> =item "properties" (B<OSSL_DRBG_PARAM_PROPERTIES>) <UTF8 string> diff --git a/doc/man7/EVP_RAND-HASH-DRBG.pod b/doc/man7/EVP_RAND-HASH-DRBG.pod index 879384993e..b85010dd41 100644 --- a/doc/man7/EVP_RAND-HASH-DRBG.pod +++ b/doc/man7/EVP_RAND-HASH-DRBG.pod @@ -42,7 +42,7 @@ The supported parameters are: =item "max_adinlen" (B<OSSL_DRBG_PARAM_MAX_ADINLEN>) <unsigned integer> -=item "reseed_counter" (B<OSSL_DRBG_PARAM_RESEED_CTR>) <unsigned integer> +=item "reseed_counter" (B<OSSL_DRBG_PARAM_RESEED_COUNTER>) <unsigned integer> =item "properties" (B<OSSL_DRBG_PARAM_PROPERTIES>) <UTF8 string> diff --git a/doc/man7/EVP_RAND-HMAC-DRBG.pod b/doc/man7/EVP_RAND-HMAC-DRBG.pod index 31b17a97ba..e9620783b0 100644 --- a/doc/man7/EVP_RAND-HMAC-DRBG.pod +++ b/doc/man7/EVP_RAND-HMAC-DRBG.pod @@ -42,7 +42,7 @@ The supported parameters are: =item "max_adinlen" (B<OSSL_DRBG_PARAM_MAX_ADINLEN>) <unsigned integer> -=item "reseed_counter" (B<OSSL_DRBG_PARAM_RESEED_CTR>) <unsigned integer> +=item "reseed_counter" (B<OSSL_DRBG_PARAM_RESEED_COUNTER>) <unsigned integer> =item "properties" (B<OSSL_DRBG_PARAM_PROPERTIES>) <UTF8 string> diff --git a/doc/man7/EVP_RAND-TEST-RAND.pod b/doc/man7/EVP_RAND-TEST-RAND.pod index 4736b5a976..9eb7001d64 100644 --- a/doc/man7/EVP_RAND-TEST-RAND.pod +++ b/doc/man7/EVP_RAND-TEST-RAND.pod @@ -44,7 +44,7 @@ These parameter works as described in L<EVP_RAND(3)/PARAMETERS>. =item "max_adinlen" (B<OSSL_DRBG_PARAM_MAX_ADINLEN>) <unsigned integer> -=item "reseed_counter" (B<OSSL_DRBG_PARAM_RESEED_CTR>) <unsigned integer> +=item "reseed_counter" (B<OSSL_DRBG_PARAM_RESEED_COUNTER>) <unsigned integer> These parameters work as described in L<EVP_RAND(3)/PARAMETERS>, except that they can all be set as well as read. diff --git a/doc/man7/provider-rand.pod b/doc/man7/provider-rand.pod index 8b310726ff..d75a36d01e 100644 --- a/doc/man7/provider-rand.pod +++ b/doc/man7/provider-rand.pod @@ -208,7 +208,7 @@ instantiate the DRBG. Specify the minimum and maximum number of bytes of personalisation string that can be used with the DRBG. -=item "reseed_counter" (B<OSSL_DRBG_PARAM_RESEED_CTR>) <unsigned integer> +=item "reseed_counter" (B<OSSL_DRBG_PARAM_RESEED_COUNTER>) <unsigned integer> Specifies the number of times the DRBG has been seeded or reseeded. |