summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLong Qin <qin.long@intel.com>2017-04-06 13:53:06 +0800
committerQin Long <qin.long@intel.com>2017-04-07 00:22:07 +0800
commitabc4c8173dab56633e883847721da577e8c80388 (patch)
tree2d1d71b0cb6a8448b578f331feee1972ce32f7a4
parentcffa7925a293d991957bc47865eac25516b59e63 (diff)
downloadedk2-platforms-abc4c8173dab56633e883847721da577e8c80388.tar.xz
CryptoPkg: Move openssl and CRT headers to private include section
Moving the header files for openssl and CRT wrappers to the private include section, since these files should be referenced by CryptoPkg internally. This update was supported by new [Includes.Common.Private] setting in Package DEC file. The external consumer modules should only use the interfaces defined in BaseCryptLib.h to access crypto functions. This change will be helpful to immediately detect any illegal direct reference to internal openssl headers. The Perl script "process_files.pl" was also updated to reflect the new private include path. Cc: Gao Liming <liming.gao@intel.com> Cc: Ting Ye <ting.ye@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qin Long <qin.long@intel.com> Reviewed-by: Ye Ting <ting.ye@intel.com>
-rw-r--r--CryptoPkg/CryptoPkg.dec3
-rw-r--r--CryptoPkg/Library/Include/CrtLibSupport.h (renamed from CryptoPkg/Include/CrtLibSupport.h)0
-rw-r--r--CryptoPkg/Library/Include/assert.h (renamed from CryptoPkg/Include/assert.h)0
-rw-r--r--CryptoPkg/Library/Include/ctype.h (renamed from CryptoPkg/Include/ctype.h)0
-rw-r--r--CryptoPkg/Library/Include/errno.h (renamed from CryptoPkg/Include/errno.h)0
-rw-r--r--CryptoPkg/Library/Include/internal/dso_conf.h (renamed from CryptoPkg/Include/internal/dso_conf.h)0
-rw-r--r--CryptoPkg/Library/Include/limits.h (renamed from CryptoPkg/Include/limits.h)0
-rw-r--r--CryptoPkg/Library/Include/memory.h (renamed from CryptoPkg/Include/memory.h)0
-rw-r--r--CryptoPkg/Library/Include/openssl/opensslconf.h (renamed from CryptoPkg/Include/openssl/opensslconf.h)0
-rw-r--r--CryptoPkg/Library/Include/stdarg.h (renamed from CryptoPkg/Include/stdarg.h)0
-rw-r--r--CryptoPkg/Library/Include/stddef.h (renamed from CryptoPkg/Include/stddef.h)0
-rw-r--r--CryptoPkg/Library/Include/stdio.h (renamed from CryptoPkg/Include/stdio.h)0
-rw-r--r--CryptoPkg/Library/Include/stdlib.h (renamed from CryptoPkg/Include/stdlib.h)0
-rw-r--r--CryptoPkg/Library/Include/string.h (renamed from CryptoPkg/Include/string.h)0
-rw-r--r--CryptoPkg/Library/Include/strings.h (renamed from CryptoPkg/Include/strings.h)0
-rw-r--r--CryptoPkg/Library/Include/sys/time.h (renamed from CryptoPkg/Include/sys/time.h)0
-rw-r--r--CryptoPkg/Library/Include/sys/types.h (renamed from CryptoPkg/Include/sys/types.h)0
-rw-r--r--CryptoPkg/Library/Include/syslog.h (renamed from CryptoPkg/Include/syslog.h)0
-rw-r--r--CryptoPkg/Library/Include/time.h (renamed from CryptoPkg/Include/time.h)0
-rw-r--r--CryptoPkg/Library/Include/unistd.h (renamed from CryptoPkg/Include/unistd.h)0
-rw-r--r--CryptoPkg/Library/OpensslLib/process_files.pl2
21 files changed, 4 insertions, 1 deletions
diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec
index fdccbf06f7..b2fae6142a 100644
--- a/CryptoPkg/CryptoPkg.dec
+++ b/CryptoPkg/CryptoPkg.dec
@@ -24,6 +24,9 @@
[Includes]
Include
+
+[Includes.Common.Private]
+ Library/Include
Library/OpensslLib/openssl/include
Library/OpensslLib/openssl/crypto/include
diff --git a/CryptoPkg/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h
index ddf7784a37..ddf7784a37 100644
--- a/CryptoPkg/Include/CrtLibSupport.h
+++ b/CryptoPkg/Library/Include/CrtLibSupport.h
diff --git a/CryptoPkg/Include/assert.h b/CryptoPkg/Library/Include/assert.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/assert.h
+++ b/CryptoPkg/Library/Include/assert.h
diff --git a/CryptoPkg/Include/ctype.h b/CryptoPkg/Library/Include/ctype.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/ctype.h
+++ b/CryptoPkg/Library/Include/ctype.h
diff --git a/CryptoPkg/Include/errno.h b/CryptoPkg/Library/Include/errno.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/errno.h
+++ b/CryptoPkg/Library/Include/errno.h
diff --git a/CryptoPkg/Include/internal/dso_conf.h b/CryptoPkg/Library/Include/internal/dso_conf.h
index e69de29bb2..e69de29bb2 100644
--- a/CryptoPkg/Include/internal/dso_conf.h
+++ b/CryptoPkg/Library/Include/internal/dso_conf.h
diff --git a/CryptoPkg/Include/limits.h b/CryptoPkg/Library/Include/limits.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/limits.h
+++ b/CryptoPkg/Library/Include/limits.h
diff --git a/CryptoPkg/Include/memory.h b/CryptoPkg/Library/Include/memory.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/memory.h
+++ b/CryptoPkg/Library/Include/memory.h
diff --git a/CryptoPkg/Include/openssl/opensslconf.h b/CryptoPkg/Library/Include/openssl/opensslconf.h
index 1917d7ab24..1917d7ab24 100644
--- a/CryptoPkg/Include/openssl/opensslconf.h
+++ b/CryptoPkg/Library/Include/openssl/opensslconf.h
diff --git a/CryptoPkg/Include/stdarg.h b/CryptoPkg/Library/Include/stdarg.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/stdarg.h
+++ b/CryptoPkg/Library/Include/stdarg.h
diff --git a/CryptoPkg/Include/stddef.h b/CryptoPkg/Library/Include/stddef.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/stddef.h
+++ b/CryptoPkg/Library/Include/stddef.h
diff --git a/CryptoPkg/Include/stdio.h b/CryptoPkg/Library/Include/stdio.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/stdio.h
+++ b/CryptoPkg/Library/Include/stdio.h
diff --git a/CryptoPkg/Include/stdlib.h b/CryptoPkg/Library/Include/stdlib.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/stdlib.h
+++ b/CryptoPkg/Library/Include/stdlib.h
diff --git a/CryptoPkg/Include/string.h b/CryptoPkg/Library/Include/string.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/string.h
+++ b/CryptoPkg/Library/Include/string.h
diff --git a/CryptoPkg/Include/strings.h b/CryptoPkg/Library/Include/strings.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/strings.h
+++ b/CryptoPkg/Library/Include/strings.h
diff --git a/CryptoPkg/Include/sys/time.h b/CryptoPkg/Library/Include/sys/time.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/sys/time.h
+++ b/CryptoPkg/Library/Include/sys/time.h
diff --git a/CryptoPkg/Include/sys/types.h b/CryptoPkg/Library/Include/sys/types.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/sys/types.h
+++ b/CryptoPkg/Library/Include/sys/types.h
diff --git a/CryptoPkg/Include/syslog.h b/CryptoPkg/Library/Include/syslog.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/syslog.h
+++ b/CryptoPkg/Library/Include/syslog.h
diff --git a/CryptoPkg/Include/time.h b/CryptoPkg/Library/Include/time.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/time.h
+++ b/CryptoPkg/Library/Include/time.h
diff --git a/CryptoPkg/Include/unistd.h b/CryptoPkg/Library/Include/unistd.h
index 1a8d1c47de..1a8d1c47de 100644
--- a/CryptoPkg/Include/unistd.h
+++ b/CryptoPkg/Library/Include/unistd.h
diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl
index 4a60073485..f6e1f43641 100644
--- a/CryptoPkg/Library/OpensslLib/process_files.pl
+++ b/CryptoPkg/Library/OpensslLib/process_files.pl
@@ -214,7 +214,7 @@ print "Done!";
#
print "\n--> Duplicating opensslconf.h into Include/openssl ... ";
copy($OPENSSL_PATH . "/include/openssl/opensslconf.h",
- $OPENSSL_PATH . "/../../../Include/openssl/") ||
+ $OPENSSL_PATH . "/../../Include/openssl/") ||
die "Cannot copy opensslconf.h!";
print "Done!\n";