[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Thu May 14 13:28:31 UTC 2015
The branch master has been updated
via c40dba984a626fb622bb4264bd8e297236bbfd2b (commit)
via 685707979100dcb344f3d5f29940afcb1e7a92c2 (commit)
from 167f6c93b00e1184b89d6a5c7a1ed22dbab03c68 (commit)
- Log -----------------------------------------------------------------
commit c40dba984a626fb622bb4264bd8e297236bbfd2b
Author: Richard Levitte <levitte at openssl.org>
Date: Thu May 14 14:58:15 2015 +0200
make depend
Reviewed-by: Matt Caswell <matt at openssl.org>
commit 685707979100dcb344f3d5f29940afcb1e7a92c2
Author: Richard Levitte <levitte at openssl.org>
Date: Thu May 14 14:54:49 2015 +0200
Identify and move OpenSSL internal header files
There are header files in crypto/ that are used by the rest of
OpenSSL. Move those to include/internal and adapt the affected source
code, Makefiles and scripts.
The header files that got moved are:
crypto/constant_time_locl.h
crypto/o_dir.h
crypto/o_str.h
Reviewed-by: Matt Caswell <matt at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
crypto/Makefile | 11 ++-
crypto/o_dir.c | 2 +-
crypto/o_dir_test.c | 2 +-
crypto/o_str.c | 2 +-
crypto/rsa/Makefile | 34 ++++-----
crypto/rsa/rsa_oaep.c | 2 +-
crypto/rsa/rsa_pk1.c | 2 +-
e_os.h | 4 +-
{crypto => include/internal}/constant_time_locl.h | 0
{crypto => include/internal}/o_dir.h | 0
{crypto => include/internal}/o_str.h | 0
ssl/Makefile | 93 ++++++++++++-----------
ssl/record/ssl3_record.c | 2 +-
ssl/s3_cbc.c | 2 +-
ssl/s3_srvr.c | 2 +-
ssl/ssl_cert.c | 2 +-
test/Makefile | 2 +-
test/constant_time_test.c | 2 +-
util/mkdef.pl | 4 +-
19 files changed, 84 insertions(+), 84 deletions(-)
rename {crypto => include/internal}/constant_time_locl.h (100%)
rename {crypto => include/internal}/o_dir.h (100%)
rename {crypto => include/internal}/o_str.h (100%)
diff --git a/crypto/Makefile b/crypto/Makefile
index 5270d75..33ec1b8 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -43,8 +43,7 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o \
SRC= $(LIBSRC)
-HEADER= cryptlib.h buildinf.h md32_common.h o_str.h o_dir.h \
- constant_time_locl.h
+HEADER= cryptlib.h buildinf.h md32_common.h
ALL= $(GENERAL) $(SRC) $(HEADER)
@@ -183,8 +182,8 @@ mem_dbg.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
mem_dbg.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
mem_dbg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
mem_dbg.o: mem_dbg.c
-o_dir.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
-o_dir.o: LPdir_unix.c o_dir.c o_dir.h
+o_dir.o: ../e_os.h ../include/internal/o_dir.h ../include/openssl/e_os2.h
+o_dir.o: ../include/openssl/opensslconf.h LPdir_unix.c o_dir.c
o_fips.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
o_fips.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
o_fips.o: ../include/openssl/err.h ../include/openssl/lhash.h
@@ -198,8 +197,8 @@ o_init.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
o_init.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
o_init.o: ../include/openssl/safestack.h ../include/openssl/stack.h
o_init.o: ../include/openssl/symhacks.h o_init.c
-o_str.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
-o_str.o: o_str.c o_str.h
+o_str.o: ../e_os.h ../include/internal/o_str.h ../include/openssl/e_os2.h
+o_str.o: ../include/openssl/opensslconf.h o_str.c
o_time.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
o_time.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
o_time.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
diff --git a/crypto/o_dir.c b/crypto/o_dir.c
index 2624244..7bff74e 100644
--- a/crypto/o_dir.c
+++ b/crypto/o_dir.c
@@ -70,7 +70,7 @@
#define LP_find_file OPENSSL_DIR_read
#define LP_find_file_end OPENSSL_DIR_end
-#include "o_dir.h"
+#include "internal/o_dir.h"
#define LPDIR_H
#if defined OPENSSL_SYS_UNIX || defined DJGPP
diff --git a/crypto/o_dir_test.c b/crypto/o_dir_test.c
index 7cdbbbc..733ffec 100644
--- a/crypto/o_dir_test.c
+++ b/crypto/o_dir_test.c
@@ -36,7 +36,7 @@
#include <stdio.h>
#include <errno.h>
#include "e_os2.h"
-#include "o_dir.h"
+#include "internal/o_dir.h"
#if defined OPENSSL_SYS_UNIX || defined OPENSSL_SYS_WIN32 || defined OPENSSL_SYS_WINCE
# define CURRDIR "."
diff --git a/crypto/o_str.c b/crypto/o_str.c
index 16fd4e4..f2f9404 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -59,7 +59,7 @@
#include <ctype.h>
#include <e_os.h>
-#include "o_str.h"
+#include "internal/o_str.h"
#if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \
!defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_WINCE) && \
diff --git a/crypto/rsa/Makefile b/crypto/rsa/Makefile
index be8dc75..b075f6a 100644
--- a/crypto/rsa/Makefile
+++ b/crypto/rsa/Makefile
@@ -181,27 +181,27 @@ rsa_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
rsa_null.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
rsa_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
rsa_null.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_null.c
-rsa_oaep.o: ../../e_os.h ../../include/openssl/asn1.h
-rsa_oaep.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-rsa_oaep.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-rsa_oaep.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-rsa_oaep.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-rsa_oaep.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-rsa_oaep.o: ../../include/openssl/opensslconf.h
+rsa_oaep.o: ../../e_os.h ../../include/internal/constant_time_locl.h
+rsa_oaep.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+rsa_oaep.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+rsa_oaep.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+rsa_oaep.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+rsa_oaep.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+rsa_oaep.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
rsa_oaep.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
rsa_oaep.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
rsa_oaep.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
rsa_oaep.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rsa_oaep.o: ../constant_time_locl.h ../cryptlib.h rsa_oaep.c
-rsa_pk1.o: ../../e_os.h ../../include/openssl/asn1.h
-rsa_pk1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-rsa_pk1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-rsa_pk1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-rsa_pk1.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-rsa_pk1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-rsa_pk1.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-rsa_pk1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rsa_pk1.o: ../../include/openssl/symhacks.h ../constant_time_locl.h
+rsa_oaep.o: ../cryptlib.h rsa_oaep.c
+rsa_pk1.o: ../../e_os.h ../../include/internal/constant_time_locl.h
+rsa_pk1.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+rsa_pk1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+rsa_pk1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+rsa_pk1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+rsa_pk1.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+rsa_pk1.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+rsa_pk1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_pk1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
rsa_pk1.o: ../cryptlib.h rsa_pk1.c
rsa_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h
rsa_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c
index d988d6c..6edfb41 100644
--- a/crypto/rsa/rsa_oaep.c
+++ b/crypto/rsa/rsa_oaep.c
@@ -17,7 +17,7 @@
* one-wayness. For the RSA function, this is an equivalent notion.
*/
-#include "constant_time_locl.h"
+#include "internal/constant_time_locl.h"
#include <stdio.h>
#include "cryptlib.h"
diff --git a/crypto/rsa/rsa_pk1.c b/crypto/rsa/rsa_pk1.c
index 1bda998..e32a1d5 100644
--- a/crypto/rsa/rsa_pk1.c
+++ b/crypto/rsa/rsa_pk1.c
@@ -56,7 +56,7 @@
* [including the GNU Public Licence.]
*/
-#include "constant_time_locl.h"
+#include "internal/constant_time_locl.h"
#include <stdio.h>
#include "cryptlib.h"
diff --git a/e_os.h b/e_os.h
index 7f94bfc..4c1b4aa 100644
--- a/e_os.h
+++ b/e_os.h
@@ -605,7 +605,7 @@ extern int sys_nerr;
# define strerror(errnum) \
(((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum])
/* Being signed SunOS 4.x memcpy breaks ASN1_OBJECT table lookup */
-# include "crypto/o_str.h"
+# include "internal/o_str.h"
# define memcmp OPENSSL_memcmp
# endif
@@ -624,7 +624,7 @@ extern int sys_nerr;
# define strncasecmp _strnicmp
# elif defined(OPENSSL_SYS_VMS)
/* VMS below version 7.0 doesn't have strcasecmp() */
-# include "o_str.h"
+# include "internal/o_str.h"
# define strcasecmp OPENSSL_strcasecmp
# define strncasecmp OPENSSL_strncasecmp
# define OPENSSL_IMPLEMENTS_strncasecmp
diff --git a/crypto/constant_time_locl.h b/include/internal/constant_time_locl.h
similarity index 100%
rename from crypto/constant_time_locl.h
rename to include/internal/constant_time_locl.h
diff --git a/crypto/o_dir.h b/include/internal/o_dir.h
similarity index 100%
rename from crypto/o_dir.h
rename to include/internal/o_dir.h
diff --git a/crypto/o_str.h b/include/internal/o_str.h
similarity index 100%
rename from crypto/o_str.h
rename to include/internal/o_str.h
diff --git a/ssl/Makefile b/ssl/Makefile
index 18b17d2..bb00516 100644
--- a/ssl/Makefile
+++ b/ssl/Makefile
@@ -5,7 +5,7 @@
DIR= ssl
TOP= ..
CC= cc
-INCLUDES= -I../crypto -I$(TOP) -I../include
+INCLUDES= -I$(TOP) -I../include
CFLAG=-g
MAKEFILE= Makefile
AR= ar r
@@ -430,26 +430,27 @@ s3_both.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
s3_both.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
s3_both.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
s3_both.o: record/record.h s3_both.c ssl_locl.h
-s3_cbc.o: ../crypto/constant_time_locl.h ../e_os.h ../include/openssl/asn1.h
-s3_cbc.o: ../include/openssl/bio.h ../include/openssl/buffer.h
-s3_cbc.o: ../include/openssl/comp.h ../include/openssl/crypto.h
-s3_cbc.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h
-s3_cbc.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
-s3_cbc.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
-s3_cbc.o: ../include/openssl/err.h ../include/openssl/evp.h
-s3_cbc.o: ../include/openssl/hmac.h ../include/openssl/lhash.h
-s3_cbc.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h
-s3_cbc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s3_cbc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-s3_cbc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-s3_cbc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
-s3_cbc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s3_cbc.o: ../include/openssl/sha.h ../include/openssl/srtp.h
-s3_cbc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s3_cbc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s3_cbc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s3_cbc.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-s3_cbc.o: ../include/openssl/x509_vfy.h record/record.h s3_cbc.c ssl_locl.h
+s3_cbc.o: ../e_os.h ../include/internal/constant_time_locl.h
+s3_cbc.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+s3_cbc.o: ../include/openssl/buffer.h ../include/openssl/comp.h
+s3_cbc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
+s3_cbc.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
+s3_cbc.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
+s3_cbc.o: ../include/openssl/ecdsa.h ../include/openssl/err.h
+s3_cbc.o: ../include/openssl/evp.h ../include/openssl/hmac.h
+s3_cbc.o: ../include/openssl/lhash.h ../include/openssl/md5.h
+s3_cbc.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+s3_cbc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s3_cbc.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+s3_cbc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+s3_cbc.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
+s3_cbc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s3_cbc.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+s3_cbc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s3_cbc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s3_cbc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s3_cbc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+s3_cbc.o: record/record.h s3_cbc.c ssl_locl.h
s3_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
s3_clnt.o: ../include/openssl/bn.h ../include/openssl/buffer.h
s3_clnt.o: ../include/openssl/comp.h ../include/openssl/crypto.h
@@ -550,28 +551,28 @@ s3_msg.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
s3_msg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
s3_msg.o: ../include/openssl/tls1.h ../include/openssl/x509.h
s3_msg.o: ../include/openssl/x509_vfy.h record/record.h s3_msg.c ssl_locl.h
-s3_srvr.o: ../crypto/constant_time_locl.h ../e_os.h ../include/openssl/asn1.h
-s3_srvr.o: ../include/openssl/bio.h ../include/openssl/bn.h
-s3_srvr.o: ../include/openssl/buffer.h ../include/openssl/comp.h
-s3_srvr.o: ../include/openssl/crypto.h ../include/openssl/dh.h
-s3_srvr.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h
-s3_srvr.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
-s3_srvr.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
-s3_srvr.o: ../include/openssl/err.h ../include/openssl/evp.h
-s3_srvr.o: ../include/openssl/hmac.h ../include/openssl/lhash.h
-s3_srvr.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h
-s3_srvr.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s3_srvr.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-s3_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-s3_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
-s3_srvr.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-s3_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s3_srvr.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
-s3_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s3_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s3_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s3_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-s3_srvr.o: record/record.h s3_srvr.c ssl_locl.h
+s3_srvr.o: ../e_os.h ../include/internal/constant_time_locl.h
+s3_srvr.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+s3_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+s3_srvr.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+s3_srvr.o: ../include/openssl/dh.h ../include/openssl/dsa.h
+s3_srvr.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
+s3_srvr.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
+s3_srvr.o: ../include/openssl/ecdsa.h ../include/openssl/err.h
+s3_srvr.o: ../include/openssl/evp.h ../include/openssl/hmac.h
+s3_srvr.o: ../include/openssl/lhash.h ../include/openssl/md5.h
+s3_srvr.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+s3_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s3_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+s3_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+s3_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
+s3_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s3_srvr.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+s3_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s3_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s3_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s3_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s3_srvr.o: ../include/openssl/x509_vfy.h record/record.h s3_srvr.c ssl_locl.h
ssl3_buffer.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
ssl3_buffer.o: ../include/openssl/buffer.h ../include/openssl/comp.h
ssl3_buffer.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -593,7 +594,8 @@ ssl3_buffer.o: ../include/openssl/tls1.h ../include/openssl/x509.h
ssl3_buffer.o: ../include/openssl/x509_vfy.h record/../record/record.h
ssl3_buffer.o: record/../ssl_locl.h record/record_locl.h record/ssl3_buffer.c
ssl3_buffer.o: ssl3_buffer.c
-ssl3_record.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+ssl3_record.o: ../e_os.h ../include/internal/constant_time_locl.h
+ssl3_record.o: ../include/openssl/asn1.h ../include/openssl/bio.h
ssl3_record.o: ../include/openssl/buffer.h ../include/openssl/comp.h
ssl3_record.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
ssl3_record.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
@@ -612,7 +614,6 @@ ssl3_record.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
ssl3_record.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
ssl3_record.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
ssl3_record.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-ssl3_record.o: record/../../crypto/constant_time_locl.h
ssl3_record.o: record/../record/record.h record/../ssl_locl.h
ssl3_record.o: record/record_locl.h record/ssl3_record.c ssl3_record.c
ssl_algs.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -654,7 +655,7 @@ ssl_asn1.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
ssl_asn1.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
ssl_asn1.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
ssl_asn1.o: record/record.h ssl_asn1.c ssl_locl.h
-ssl_cert.o: ../crypto/o_dir.h ../e_os.h ../include/openssl/asn1.h
+ssl_cert.o: ../e_os.h ../include/internal/o_dir.h ../include/openssl/asn1.h
ssl_cert.o: ../include/openssl/bio.h ../include/openssl/bn.h
ssl_cert.o: ../include/openssl/buffer.h ../include/openssl/comp.h
ssl_cert.o: ../include/openssl/conf.h ../include/openssl/crypto.h
diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index db6d4e7..0328127 100644
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -110,7 +110,7 @@
*/
#include "../ssl_locl.h"
-#include "../../crypto/constant_time_locl.h"
+#include "internal/constant_time_locl.h"
#include <openssl/rand.h>
#include "record_locl.h"
diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
index ac0c5f3..f7997ea 100644
--- a/ssl/s3_cbc.c
+++ b/ssl/s3_cbc.c
@@ -53,7 +53,7 @@
*
*/
-#include "../crypto/constant_time_locl.h"
+#include "internal/constant_time_locl.h"
#include "ssl_locl.h"
#include <openssl/md5.h>
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 04dbb7a..4ee45eb 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -151,7 +151,7 @@
#include <stdio.h>
#include "ssl_locl.h"
-#include "../crypto/constant_time_locl.h"
+#include "internal/constant_time_locl.h"
#include <openssl/buffer.h>
#include <openssl/rand.h>
#include <openssl/objects.h>
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 38e7b82..d8b47e6 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -123,7 +123,7 @@
# include <sys/types.h>
#endif
-#include "o_dir.h"
+#include "internal/o_dir.h"
#include <openssl/objects.h>
#include <openssl/bio.h>
#include <openssl/pem.h>
diff --git a/test/Makefile b/test/Makefile
index 4c1d9d0..01724aa 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -608,7 +608,7 @@ bntest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
bntest.o: ../include/openssl/x509_vfy.h bntest.c
casttest.o: ../e_os.h ../include/openssl/cast.h ../include/openssl/e_os2.h
casttest.o: ../include/openssl/opensslconf.h casttest.c
-constant_time_test.o: ../crypto/constant_time_locl.h ../e_os.h
+constant_time_test.o: ../e_os.h ../include/internal/constant_time_locl.h
constant_time_test.o: ../include/openssl/e_os2.h
constant_time_test.o: ../include/openssl/opensslconf.h constant_time_test.c
destest.o: ../include/openssl/des.h ../include/openssl/e_os2.h
diff --git a/test/constant_time_test.c b/test/constant_time_test.c
index bdb2702..ed3d7ea 100644
--- a/test/constant_time_test.c
+++ b/test/constant_time_test.c
@@ -44,7 +44,7 @@
* [including the GNU Public Licence.]
*/
-#include "../crypto/constant_time_locl.h"
+#include "internal/constant_time_locl.h"
#include <limits.h>
#include <stdio.h>
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 6c4ce3f..18bc1ab 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -262,8 +262,8 @@ $ssl.=" include/openssl/srtp.h";
my $crypto ="include/openssl/crypto.h";
$crypto.=" crypto/cryptlib.h";
-$crypto.=" crypto/o_dir.h";
-$crypto.=" crypto/o_str.h";
+$crypto.=" include/internal/o_dir.h";
+$crypto.=" include/internal/o_str.h";
$crypto.=" include/openssl/des.h" ; # unless $no_des;
$crypto.=" include/openssl/idea.h" ; # unless $no_idea;
$crypto.=" include/openssl/rc4.h" ; # unless $no_rc4;
More information about the openssl-commits
mailing list