From: Pauli <paul.dale@oracle.com>
Date: Wed, 8 Apr 2020 02:33:47 +0000 (+1000)
Subject: Fix AES-CTR_DRBG on 1.1.1.
X-Git-Tag: OpenSSL_1_1_1g~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0d011f540400b425aba1c3e59624ad9dbabe83cb;p=oweals%2Fopenssl.git

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)
---

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.
  */