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 <tjh@openssl.org>
Conflicts:
	crypto/evp/evp_enc.c
	crypto/rsa/rsa_oaep.c
	crypto/rsa/rsa_pk1.c

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index 6b7cc902428f1e198eb987dbd1653ada04bf7202..2f121ff9cb67313b9d351ae6aac074f042bb1b45 100644 (file)
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -64,7 +64,7 @@
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #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 18ee6f4b88ef0e9820451132314b00662e0a6ee2..5f1e2e196c0ff17661f3572509db8b0e48e7ede3 100644 (file)
--- 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 <stdio.h>

diff --git a/crypto/rsa/rsa_pk1.c b/crypto/rsa/rsa_pk1.c
index e01fe62addf67f764f719e6127bfcb584107c0c8..2eb47c384150f5839a126132b6ac32f1962e2b15 100644 (file)
--- 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 <stdio.h>
 #include "cryptlib.h"