|
 |
b63792 |
diff -up openssl-1.1.1c/crypto/evp/pkey_kdf.c.edk2-build openssl-1.1.1c/crypto/evp/pkey_kdf.c
|
|
|
b63792 |
--- openssl-1.1.1c/crypto/evp/pkey_kdf.c.edk2-build 2019-11-14 16:25:09.437914854 +0100
|
|
|
b63792 |
+++ openssl-1.1.1c/crypto/evp/pkey_kdf.c 2019-11-15 14:52:40.216905772 +0100
|
|
|
b63792 |
@@ -12,6 +12,7 @@
|
|
|
b63792 |
#include <openssl/evp.h>
|
|
|
b63792 |
#include <openssl/err.h>
|
|
|
b63792 |
#include <openssl/kdf.h>
|
|
|
b63792 |
+#include "internal/numbers.h"
|
|
|
b63792 |
#include "internal/evp_int.h"
|
|
|
b63792 |
|
|
|
b63792 |
static int pkey_kdf_init(EVP_PKEY_CTX *ctx)
|
|
|
b63792 |
diff -up openssl-1.1.1c/crypto/include/internal/fips_int.h.edk2-build openssl-1.1.1c/crypto/include/internal/fips_int.h
|
|
|
b63792 |
--- openssl-1.1.1c/crypto/include/internal/fips_int.h.edk2-build 2019-11-14 16:25:09.430914981 +0100
|
|
|
b63792 |
+++ openssl-1.1.1c/crypto/include/internal/fips_int.h 2019-11-15 14:48:02.489936610 +0100
|
|
|
b63792 |
@@ -50,10 +50,6 @@
|
|
|
b63792 |
#include <openssl/opensslconf.h>
|
|
|
b63792 |
#include <openssl/evp.h>
|
|
|
b63792 |
|
|
|
b63792 |
-#ifndef OPENSSL_FIPS
|
|
|
b63792 |
-# error FIPS is disabled.
|
|
|
b63792 |
-#endif
|
|
|
b63792 |
-
|
|
|
b63792 |
#ifdef OPENSSL_FIPS
|
|
|
b63792 |
|
|
|
b63792 |
int FIPS_module_mode_set(int onoff);
|
|
|
b63792 |
@@ -97,4 +93,8 @@ void fips_set_selftest_fail(void);
|
|
|
b63792 |
|
|
|
b63792 |
void FIPS_get_timevec(unsigned char *buf, unsigned long *pctr);
|
|
|
b63792 |
|
|
|
b63792 |
+#else
|
|
|
b63792 |
+
|
|
|
b63792 |
+# define fips_in_post() 0
|
|
|
b63792 |
+
|
|
|
b63792 |
#endif
|
|
|
b63792 |
diff -up openssl-1.1.1c/crypto/kdf/hkdf.c.edk2-build openssl-1.1.1c/crypto/kdf/hkdf.c
|
|
|
b63792 |
--- openssl-1.1.1c/crypto/kdf/hkdf.c.edk2-build 2019-11-14 16:25:09.438914836 +0100
|
|
|
b63792 |
+++ openssl-1.1.1c/crypto/kdf/hkdf.c 2019-11-15 14:48:53.360015134 +0100
|
|
|
b63792 |
@@ -13,6 +13,7 @@
|
|
|
b63792 |
#include <openssl/hmac.h>
|
|
|
b63792 |
#include <openssl/evp.h>
|
|
|
b63792 |
#include <openssl/kdf.h>
|
|
|
b63792 |
+#include "internal/numbers.h"
|
|
|
b63792 |
#include "internal/cryptlib.h"
|
|
|
b63792 |
#include "internal/evp_int.h"
|
|
|
b63792 |
#include "kdf_local.h"
|
|
|
b63792 |
diff -up openssl-1.1.1c/crypto/kdf/sshkdf.c.edk2-build openssl-1.1.1c/crypto/kdf/sshkdf.c
|
|
|
b63792 |
--- openssl-1.1.1c/crypto/kdf/sshkdf.c.edk2-build 2019-11-14 16:25:09.452914583 +0100
|
|
|
b63792 |
+++ openssl-1.1.1c/crypto/kdf/sshkdf.c 2019-11-15 14:53:14.769279878 +0100
|
|
|
b63792 |
@@ -12,6 +12,7 @@
|
|
|
b63792 |
#include <string.h>
|
|
|
b63792 |
#include <openssl/evp.h>
|
|
|
b63792 |
#include <openssl/kdf.h>
|
|
|
b63792 |
+#include "internal/numbers.h"
|
|
|
b63792 |
#include "internal/cryptlib.h"
|
|
|
b63792 |
#include "internal/evp_int.h"
|
|
|
b63792 |
#include "kdf_local.h"
|
|
|
b63792 |
diff -up openssl-1.1.1c/crypto/rand/rand_unix.c.edk2-build openssl-1.1.1c/crypto/rand/rand_unix.c
|
|
|
b63792 |
--- openssl-1.1.1c/crypto/rand/rand_unix.c.edk2-build 2019-11-14 16:25:09.430914981 +0100
|
|
|
b63792 |
+++ openssl-1.1.1c/crypto/rand/rand_unix.c 2019-11-15 14:51:41.634966941 +0100
|
|
|
b63792 |
@@ -19,7 +19,7 @@
|
|
|
b63792 |
#include "internal/fips_int.h"
|
|
|
b63792 |
#include <stdio.h>
|
|
|
b63792 |
#include "internal/dso.h"
|
|
|
b63792 |
-#if defined(__linux)
|
|
|
b63792 |
+#if defined(__linux) && !defined(OPENSSL_SYS_UEFI)
|
|
|
b63792 |
# include <sys/syscall.h>
|
|
|
b63792 |
# include <sys/random.h>
|
|
|
b63792 |
#endif
|