diff options
author | Geoff Thorpe <geoff@openssl.org> | 2014-10-11 14:31:53 -0400 |
---|---|---|
committer | Geoff Thorpe <geoff@openssl.org> | 2014-12-08 14:21:35 -0500 |
commit | e52a3c3d1401fb917df3aa80a19575521cabe4f4 (patch) | |
tree | f8cfad6fc9c6f4b1e74e486d40f26c550de938cb | |
parent | 41bf25013032da0eeb111ce3c8fc0946c0e61c41 (diff) |
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>
-rwxr-xr-x | crypto/bn/bn_const.c | 2 | ||||
-rw-r--r-- | crypto/camellia/camellia.c | 2 | ||||
-rw-r--r-- | crypto/cms/cms_asn1.c | 2 | ||||
-rw-r--r-- | crypto/cms/cms_att.c | 2 | ||||
-rw-r--r-- | crypto/cms/cms_io.c | 2 | ||||
-rw-r--r-- | crypto/cms/cms_lib.c | 2 | ||||
-rw-r--r-- | crypto/jpake/jpake.c | 3 | ||||
-rw-r--r-- | crypto/o_time.c | 2 | ||||
-rw-r--r-- | crypto/pqueue/pqueue.c | 2 | ||||
-rw-r--r-- | crypto/ts/ts_lib.c | 2 | ||||
-rw-r--r-- | crypto/ts/ts_rsp_print.c | 2 | ||||
-rw-r--r-- | ssl/d1_srtp.c | 1 |
12 files changed, 11 insertions, 13 deletions
diff --git a/crypto/bn/bn_const.c b/crypto/bn/bn_const.c index eb60a25b3c..f5f761b533 100755 --- 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 75fc8991c0..c32d3a3304 100644 --- 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 83ae2cc0f3..348716b772 100644 --- 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 5b71722ebc..7fdb050c99 100644 --- 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 1cb0264cc5..f332a303d3 100644 --- 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 0a8200cc38..8257d06fd5 100644 --- 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 19382e3b81..9167a8d60d 100644 --- 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 867ca5ec6e..84aa5c39fc 100644 --- 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 eab13a1250..53135d029a 100644 --- 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 e8608dbf71..ca510267fc 100644 --- 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 4657f87a83..fc2efc64e5 100644 --- 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 ac1bef00ac..f18f4a0103 100644 --- 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[]= |