From 0d011f540400b425aba1c3e59624ad9dbabe83cb Mon Sep 17 00:00:00 2001 From: Pauli Date: Wed, 8 Apr 2020 12:33:47 +1000 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/11489) --- crypto/rand/build.info | 2 ++ crypto/rand/drbg_ctr.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) 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 #include #include -#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. */ -- 2.25.1