diff options
| author | Pauli <paul.dale@oracle.com> | 2020-04-08 12:33:47 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-04-09 17:16:08 +1000 |
| commit | 0d011f540400b425aba1c3e59624ad9dbabe83cb (patch) | |
| tree | ff4ac1e491846c122a38ea21a451b3e8dfcc6264 /crypto/rand | |
| parent | 9cc834d966ea5afc38fb829bfe498aed4c5d498d (diff) | |
Fix AES-CTR_DRBG on 1.1.1.
The backport of the timing information leak fix uses u32 which is defined
in crypto/modes/modes_local.h in 1.1.1 and include/crypto/modes.h for 3.0.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11489)
Diffstat (limited to 'crypto/rand')
| -rw-r--r-- | crypto/rand/build.info | 2 | ||||
| -rw-r--r-- | crypto/rand/drbg_ctr.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/crypto/rand/build.info b/crypto/rand/build.info index df9bac67f0..a4e7900bdb 100644 --- a/crypto/rand/build.info +++ b/crypto/rand/build.info @@ -2,3 +2,5 @@ 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_ctr.c + +INCLUDE[drbg_ctr.o]=../modes diff --git a/crypto/rand/drbg_ctr.c b/crypto/rand/drbg_ctr.c index f41484e9d5..af201971dd 100644 --- a/crypto/rand/drbg_ctr.c +++ b/crypto/rand/drbg_ctr.c @@ -12,9 +12,10 @@ #include <openssl/crypto.h> #include <openssl/err.h> #include <openssl/rand.h> -#include "internal/thread_once.h" +#include "modes_local.h" #include "internal/thread_once.h" #include "rand_local.h" + /* * Implementation of NIST SP 800-90A CTR DRBG. */ |