提交 e52a3c3d 编写于 作者: G Geoff Thorpe

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: NGeoff Thorpe <geoff@openssl.org>
Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 41bf2501
/* crypto/bn/knownprimes.c */ /* crypto/bn/knownprimes.c */
/* Insert boilerplate */ /* Insert boilerplate */
#include "bn.h" #include <openssl/bn.h>
/* "First Oakley Default Group" from RFC2409, section 6.1. /* "First Oakley Default Group" from RFC2409, section 6.1.
* *
......
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
* words reasonable performance even with not so modern compilers. * words reasonable performance even with not so modern compilers.
*/ */
#include "camellia.h" #include <openssl/camellia.h>
#include "cmll_locl.h" #include "cmll_locl.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
#include <openssl/asn1t.h> #include <openssl/asn1t.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
#include "cms.h" #include <openssl/cms.h>
#include "cms_lcl.h" #include "cms_lcl.h"
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
#include <openssl/err.h> #include <openssl/err.h>
#include "cms.h" #include <openssl/cms.h>
#include "cms_lcl.h" #include "cms_lcl.h"
/* CMS SignedData Attribute utilities */ /* CMS SignedData Attribute utilities */
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include "cms.h" #include <openssl/cms.h>
#include "cms_lcl.h" #include "cms_lcl.h"
int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms) int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms)
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/asn1.h> #include <openssl/asn1.h>
#include "cms.h" #include <openssl/cms.h>
#include "cms_lcl.h" #include "cms_lcl.h"
IMPLEMENT_ASN1_FUNCTIONS(CMS_ContentInfo) IMPLEMENT_ASN1_FUNCTIONS(CMS_ContentInfo)
......
#include "jpake.h" #include <openssl/jpake.h>
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#include <openssl/err.h> #include <openssl/err.h>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
#include <openssl/e_os2.h> #include <openssl/e_os2.h>
#include <string.h> #include <string.h>
#include "crypto.h" #include <openssl/crypto.h>
#ifdef OPENSSL_SYS_VMS #ifdef OPENSSL_SYS_VMS
# if __CRTL_VER >= 70000000 && \ # if __CRTL_VER >= 70000000 && \
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
#include "cryptlib.h" #include "cryptlib.h"
#include <openssl/bn.h> #include <openssl/bn.h>
#include "pqueue.h" #include <openssl/pqueue.h>
typedef struct _pqueue typedef struct _pqueue
{ {
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
#include <openssl/objects.h> #include <openssl/objects.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
#include "ts.h" #include <openssl/ts.h>
/* Local function declarations. */ /* Local function declarations. */
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
#include <openssl/objects.h> #include <openssl/objects.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
#include "ts.h" #include <openssl/ts.h>
struct status_map_st struct status_map_st
{ {
......
...@@ -120,7 +120,6 @@ ...@@ -120,7 +120,6 @@
#include <stdio.h> #include <stdio.h>
#include <openssl/objects.h> #include <openssl/objects.h>
#include "ssl_locl.h" #include "ssl_locl.h"
#include "srtp.h"
static SRTP_PROTECTION_PROFILE srtp_known_profiles[]= static SRTP_PROTECTION_PROFILE srtp_known_profiles[]=
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册