diff options
| author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2017-12-28 02:18:21 +0100 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2018-01-04 11:47:30 +1000 |
| commit | 4e585e720195788c9546a9ce71d63dafdfd2aaf1 (patch) | |
| tree | d0edbc435f78f969c07e0ae571e81793f37d8f2a /crypto | |
| parent | 767938fae99777c84818bdebae239934b8558a74 (diff) | |
crypto/rand: rename drbg_rand.c to drbg_ctr.c
The generic part of the FIPS DRBG was implemented in fips_drbg_lib.c and the
algorithm specific parts in fips_drbg_<alg>.c for <alg> in {ctr, hash, hmac}.
Additionally, there was the module fips_drbg_rand.c which contained 'gluing'
code between the RAND_METHOD api and the FIPS DRBG.
When the FIPS code was ported to master in #4019, for some reason the ctr-drbg
implementation from fips_drbg_ctr.c ended up in drbg_rand.c instead of drbg_ctr.c.
This commit renames the module drbg_rand.c back to drbg_ctr.c, thereby restoring
a simple relationship between the original fips modules and the drbg modules
in master:
fips_drbg_lib.c => drbg_lib.c /* generic part of implementation */
fips_drbg_<alg>.c => drbg_<alg>.c /* algorithm specific implementations */
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4998)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/rand/build.info | 2 | ||||
| -rw-r--r-- | crypto/rand/drbg_ctr.c (renamed from crypto/rand/drbg_rand.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/crypto/rand/build.info b/crypto/rand/build.info index 2591c01f3b..df9bac67f0 100644 --- a/crypto/rand/build.info +++ b/crypto/rand/build.info @@ -1,4 +1,4 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]=\ randfile.c rand_lib.c rand_err.c rand_egd.c \ - rand_win.c rand_unix.c rand_vms.c drbg_lib.c drbg_rand.c + rand_win.c rand_unix.c rand_vms.c drbg_lib.c drbg_ctr.c diff --git a/crypto/rand/drbg_rand.c b/crypto/rand/drbg_ctr.c index bb3acc88db..bb3acc88db 100644 --- a/crypto/rand/drbg_rand.c +++ b/crypto/rand/drbg_ctr.c |