Include <openssl/foo.h> instead of "foo.h"

Exported headers shouldn't be included as "foo.h" by code from the same
module, it should only do so for module-internal headers. This is
because the symlinking of exported headers (from include/openssl/foo.h
to crypto/foo/foo.h) is being removed, and the exported headers are
being moved to the include/openssl/ directory instead.

Change-Id: I4c1d80849544713308ddc6999a549848afc25f94
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/crypto/bn/bn_const.c b/crypto/bn/bn_const.c
index eb60a25b3c7309e1b7bebf47158a84a0182a8552..f5f761b5335727f9b75cc9b01617a072ece2e858 100755 (executable)
--- a/crypto/bn/bn_const.c
+++ b/crypto/bn/bn_const.c
@@ -1,7 +1,7 @@
 /* crypto/bn/knownprimes.c */
 /* Insert boilerplate */
 
-#include "bn.h"
+#include <openssl/bn.h>
 
 /* "First Oakley Default Group" from RFC2409, section 6.1.
  *

diff --git a/crypto/camellia/camellia.c b/crypto/camellia/camellia.c
index 75fc8991c087e3b436fb109098a8fb51700ec6cb..c32d3a330453319ba717ada41d9042e46c5a0468 100644 (file)
--- a/crypto/camellia/camellia.c
+++ b/crypto/camellia/camellia.c
@@ -81,7 +81,7 @@
  * words reasonable performance even with not so modern compilers.
  */
 
-#include "camellia.h"
+#include <openssl/camellia.h>
 #include "cmll_locl.h"
 #include <string.h>
 #include <stdlib.h>

diff --git a/crypto/cms/cms_asn1.c b/crypto/cms/cms_asn1.c
index 83ae2cc0f3bd223325d107cd8c81846bc0465390..348716b772ef450b1ba5204a8b2be5b294805448 100644 (file)
--- a/crypto/cms/cms_asn1.c
+++ b/crypto/cms/cms_asn1.c
@@ -54,7 +54,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
-#include "cms.h"
+#include <openssl/cms.h>
 #include "cms_lcl.h"
 
 

diff --git a/crypto/cms/cms_att.c b/crypto/cms/cms_att.c
index 5b71722ebc80ebc0b90d4980f84268e1d8cb3390..7fdb050c99c1dfcc8863c8dac07d21fdd59584f6 100644 (file)
--- a/crypto/cms/cms_att.c
+++ b/crypto/cms/cms_att.c
@@ -55,7 +55,7 @@
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/err.h>
-#include "cms.h"
+#include <openssl/cms.h>
 #include "cms_lcl.h"
 
 /* CMS SignedData Attribute utilities */

diff --git a/crypto/cms/cms_io.c b/crypto/cms/cms_io.c
index 1cb0264cc531fbed2cca51040b3c2c51f88b71f5..f332a303d360e060f31782995099105f7fc845ce 100644 (file)
--- a/crypto/cms/cms_io.c
+++ b/crypto/cms/cms_io.c
@@ -55,7 +55,7 @@
 #include <openssl/x509.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
-#include "cms.h"
+#include <openssl/cms.h>
 #include "cms_lcl.h"
 
 int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms)

diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
index 0a8200cc38f3601a116e73878fe55a08a6144a0e..8257d06fd5f78a0c3c315da1c992be95d9c0ead3 100644 (file)
--- a/crypto/cms/cms_lib.c
+++ b/crypto/cms/cms_lib.c
@@ -57,7 +57,7 @@
 #include <openssl/pem.h>
 #include <openssl/bio.h>
 #include <openssl/asn1.h>
-#include "cms.h"
+#include <openssl/cms.h>
 #include "cms_lcl.h"
 
 IMPLEMENT_ASN1_FUNCTIONS(CMS_ContentInfo)

diff --git a/crypto/jpake/jpake.c b/crypto/jpake/jpake.c
index 19382e3b81c8d988e456140918ba44fc12a03d7c..9167a8d60d583078939ca178b4e0b65125d3d575 100644 (file)
--- a/crypto/jpake/jpake.c
+++ b/crypto/jpake/jpake.c
@@ -1,5 +1,4 @@
-#include "jpake.h"
-
+#include <openssl/jpake.h>
 #include <openssl/crypto.h>
 #include <openssl/sha.h>
 #include <openssl/err.h>

diff --git a/crypto/o_time.c b/crypto/o_time.c
index 867ca5ec6e5a4eb81c03481b50e7169a3dd6bf84..84aa5c39fc68a0624ee95e55e41deea72de35efb 100644 (file)
--- a/crypto/o_time.c
+++ b/crypto/o_time.c
@@ -61,7 +61,7 @@
 
 #include <openssl/e_os2.h>
 #include <string.h>
-#include "crypto.h"
+#include <openssl/crypto.h>
 
 #ifdef OPENSSL_SYS_VMS
 # if __CRTL_VER >= 70000000 && \

diff --git a/crypto/pqueue/pqueue.c b/crypto/pqueue/pqueue.c
index eab13a125013bffc7b7e08d0cafb3a182b8728f5..53135d029a3eaa281d080afe6cdcfa36bb82b405 100644 (file)
--- a/crypto/pqueue/pqueue.c
+++ b/crypto/pqueue/pqueue.c
@@ -59,7 +59,7 @@
 
 #include "cryptlib.h"
 #include <openssl/bn.h>
-#include "pqueue.h"
+#include <openssl/pqueue.h>
 
 typedef struct _pqueue
        {

diff --git a/crypto/ts/ts_lib.c b/crypto/ts/ts_lib.c
index e8608dbf711e1611f4a7fbb2b3954c681782e792..ca510267fc823c7e856a755714d50a9e717dc35e 100644 (file)
--- a/crypto/ts/ts_lib.c
+++ b/crypto/ts/ts_lib.c
@@ -61,7 +61,7 @@
 #include <openssl/objects.h>
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
-#include "ts.h"
+#include <openssl/ts.h>
 
 /* Local function declarations. */
 

diff --git a/crypto/ts/ts_rsp_print.c b/crypto/ts/ts_rsp_print.c
index 4657f87a83b21fb4507c6dc760b2cc8424366ea7..fc2efc64e567c49821157ec64ff8f44340ab51f3 100644 (file)
--- a/crypto/ts/ts_rsp_print.c
+++ b/crypto/ts/ts_rsp_print.c
@@ -61,7 +61,7 @@
 #include <openssl/objects.h>
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
-#include "ts.h"
+#include <openssl/ts.h>
 
 struct status_map_st
        {

diff --git a/ssl/d1_srtp.c b/ssl/d1_srtp.c
index ac1bef00ac589095c2af6606b8569fa1c58fb127..f18f4a0103dbdcfeea303102144c131b270da07a 100644 (file)
--- a/ssl/d1_srtp.c
+++ b/ssl/d1_srtp.c
@@ -120,7 +120,6 @@
 #include <stdio.h>
 #include <openssl/objects.h>
 #include "ssl_locl.h"
-#include "srtp.h"
 
 
 static SRTP_PROTECTION_PROFILE srtp_known_profiles[]=