From 7f09a8773bc609e65fd3073117058b7087ff609f Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 24 Sep 2014 22:59:37 +0200 Subject: [PATCH] Include "constant_time_locl.h" rather than "../constant_time_locl.h". The different -I compiler parameters will take care of the rest... Reviewed-by: Tim Hudson Conflicts: crypto/evp/evp_enc.c crypto/rsa/rsa_oaep.c crypto/rsa/rsa_pk1.c --- crypto/evp/evp_enc.c | 2 +- crypto/rsa/rsa_oaep.c | 2 +- crypto/rsa/rsa_pk1.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 6b7cc90242..2f121ff9cb 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -64,7 +64,7 @@ #ifndef OPENSSL_NO_ENGINE #include #endif -#include "../constant_time_locl.h" +#include "constant_time_locl.h" #include "evp_locl.h" const char EVP_version[]="EVP" OPENSSL_VERSION_PTEXT; diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c index 18ee6f4b88..5f1e2e196c 100644 --- a/crypto/rsa/rsa_oaep.c +++ b/crypto/rsa/rsa_oaep.c @@ -20,7 +20,7 @@ #define OPENSSL_FIPSAPI -#include "../constant_time_locl.h" +#include "constant_time_locl.h" #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1) #include diff --git a/crypto/rsa/rsa_pk1.c b/crypto/rsa/rsa_pk1.c index e01fe62add..2eb47c3841 100644 --- a/crypto/rsa/rsa_pk1.c +++ b/crypto/rsa/rsa_pk1.c @@ -58,7 +58,7 @@ #define OPENSSL_FIPSAPI -#include "../constant_time_locl.h" +#include "constant_time_locl.h" #include #include "cryptlib.h" -- 2.34.1