From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id DD8CF21942338 for ; Thu, 6 Apr 2017 01:19:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491466760; x=1523002760; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=xMM/zrL1rLHb6/UE0+nDgxK7RArvUiiEVXrw3iTcHpk=; b=vSTE59Cermilwj2sLYSVAIA31VSiEeSI9OBWDhapLJEXasqIkeZU18Ue wCuFAec2tA8fpnxqe07nXzUK88PfKw==; Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Apr 2017 01:19:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,283,1488873600"; d="scan'208";a="952510506" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga003.jf.intel.com with ESMTP; 06 Apr 2017 01:19:20 -0700 Received: from fmsmsx120.amr.corp.intel.com (10.18.124.208) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 6 Apr 2017 01:19:20 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx120.amr.corp.intel.com (10.18.124.208) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 6 Apr 2017 01:19:19 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.246]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.117]) with mapi id 14.03.0319.002; Thu, 6 Apr 2017 16:19:17 +0800 From: "Gao, Liming" To: "Long, Qin" , "Ye, Ting" CC: "edk2-devel@lists.01.org" Thread-Topic: [Patch] CryptoPkg: Move openssl and CRT headers to private include section Thread-Index: AQHSrpqdEVTL63bJDUGUW4XDPTtAUaG32wIA//9+ywCAAKW/oA== Date: Thu, 6 Apr 2017 08:19:16 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14D71A131@shsmsx102.ccr.corp.intel.com> References: <20170406055612.10168-1-qin.long@intel.com> <4A89E2EF3DFEDB4C8BFDE51014F606A14D719FD5@shsmsx102.ccr.corp.intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] CryptoPkg: Move openssl and CRT headers to private include section X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Apr 2017 08:19:21 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Got it. Thanks for your clarification.=20 >-----Original Message----- >From: Long, Qin >Sent: Thursday, April 06, 2017 2:25 PM >To: Gao, Liming ; Ye, Ting >Cc: edk2-devel@lists.01.org >Subject: RE: [Patch] CryptoPkg: Move openssl and CRT headers to private >include section > >Yes, it's feasible. >I still prefer to use "Library/Include" path setting for this, since only >CryptoPkg/Library/* >will refer to these internal header files. >It may be cleaner to keep the current directory in root of CryptoPkg. > > >Best Regards & Thanks, >LONG, Qin > >> -----Original Message----- >> From: Gao, Liming >> Sent: Thursday, April 06, 2017 2:09 PM >> To: Long, Qin; Ye, Ting >> Cc: edk2-devel@lists.01.org >> Subject: RE: [Patch] CryptoPkg: Move openssl and CRT headers to private >> include section >> >> Qin: >> How about creating new Private directory in CryptoPkg, then move those >> internal header files into it? >> >> Thanks >> Liming >> >-----Original Message----- >> >From: Long, Qin >> >Sent: Thursday, April 06, 2017 1:56 PM >> >To: Gao, Liming ; Ye, Ting >> >Cc: edk2-devel@lists.01.org; Long, Qin >> >Subject: [Patch] 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 >> >Cc: Ting Ye >> >Contributed-under: TianoCore Contribution Agreement 1.0 >> >Signed-off-by: Qin Long >> >Signed-off-by: Long Qin >> >--- >> > CryptoPkg/CryptoPkg.dec | 3 +++ >> > CryptoPkg/{ =3D> Library}/Include/CrtLibSupport.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/assert.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/ctype.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/errno.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/internal/dso_conf.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/limits.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/memory.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/openssl/opensslconf.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/stdarg.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/stddef.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/stdio.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/stdlib.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/string.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/strings.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/sys/time.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/sys/types.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/syslog.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/time.h | 0 >> > CryptoPkg/{ =3D> Library}/Include/unistd.h | 0 >> > CryptoPkg/Library/OpensslLib/process_files.pl | 2 +- >> > 21 files changed, 4 insertions(+), 1 deletion(-) rename CryptoPkg/{ >> >=3D> Library}/Include/CrtLibSupport.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/assert.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/ctype.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/errno.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/internal/dso_conf.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/limits.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/memory.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/openssl/opensslconf.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/stdarg.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/stddef.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/stdio.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/stdlib.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/string.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/strings.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/sys/time.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/sys/types.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/syslog.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/time.h (100%) rename CryptoPkg/{ =3D> >> >Library}/Include/unistd.h (100%) >> > >> >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 >> >similarity index 100% >> >rename from CryptoPkg/Include/CrtLibSupport.h rename to >> >CryptoPkg/Library/Include/CrtLibSupport.h >> >diff --git a/CryptoPkg/Include/assert.h >> >b/CryptoPkg/Library/Include/assert.h >> >similarity index 100% >> >rename from CryptoPkg/Include/assert.h >> >rename to CryptoPkg/Library/Include/assert.h >> >diff --git a/CryptoPkg/Include/ctype.h >> >b/CryptoPkg/Library/Include/ctype.h >> >similarity index 100% >> >rename from CryptoPkg/Include/ctype.h >> >rename to CryptoPkg/Library/Include/ctype.h diff --git >> >a/CryptoPkg/Include/errno.h b/CryptoPkg/Library/Include/errno.h >> >similarity index 100% >> >rename from CryptoPkg/Include/errno.h >> >rename to CryptoPkg/Library/Include/errno.h diff --git >> >a/CryptoPkg/Include/internal/dso_conf.h >> >b/CryptoPkg/Library/Include/internal/dso_conf.h >> >similarity index 100% >> >rename from CryptoPkg/Include/internal/dso_conf.h >> >rename to CryptoPkg/Library/Include/internal/dso_conf.h >> >diff --git a/CryptoPkg/Include/limits.h >> >b/CryptoPkg/Library/Include/limits.h >> >similarity index 100% >> >rename from CryptoPkg/Include/limits.h >> >rename to CryptoPkg/Library/Include/limits.h >> >diff --git a/CryptoPkg/Include/memory.h >> >b/CryptoPkg/Library/Include/memory.h >> >similarity index 100% >> >rename from CryptoPkg/Include/memory.h >> >rename to CryptoPkg/Library/Include/memory.h >> >diff --git a/CryptoPkg/Include/openssl/opensslconf.h >> >b/CryptoPkg/Library/Include/openssl/opensslconf.h >> >similarity index 100% >> >rename from CryptoPkg/Include/openssl/opensslconf.h >> >rename to CryptoPkg/Library/Include/openssl/opensslconf.h >> >diff --git a/CryptoPkg/Include/stdarg.h >> >b/CryptoPkg/Library/Include/stdarg.h >> >similarity index 100% >> >rename from CryptoPkg/Include/stdarg.h >> >rename to CryptoPkg/Library/Include/stdarg.h >> >diff --git a/CryptoPkg/Include/stddef.h >> >b/CryptoPkg/Library/Include/stddef.h >> >similarity index 100% >> >rename from CryptoPkg/Include/stddef.h >> >rename to CryptoPkg/Library/Include/stddef.h >> >diff --git a/CryptoPkg/Include/stdio.h >> >b/CryptoPkg/Library/Include/stdio.h >> >similarity index 100% >> >rename from CryptoPkg/Include/stdio.h >> >rename to CryptoPkg/Library/Include/stdio.h diff --git >> >a/CryptoPkg/Include/stdlib.h b/CryptoPkg/Library/Include/stdlib.h >> >similarity index 100% >> >rename from CryptoPkg/Include/stdlib.h >> >rename to CryptoPkg/Library/Include/stdlib.h >> >diff --git a/CryptoPkg/Include/string.h >> >b/CryptoPkg/Library/Include/string.h >> >similarity index 100% >> >rename from CryptoPkg/Include/string.h >> >rename to CryptoPkg/Library/Include/string.h >> >diff --git a/CryptoPkg/Include/strings.h >> >b/CryptoPkg/Library/Include/strings.h >> >similarity index 100% >> >rename from CryptoPkg/Include/strings.h rename to >> >CryptoPkg/Library/Include/strings.h >> >diff --git a/CryptoPkg/Include/sys/time.h >> >b/CryptoPkg/Library/Include/sys/time.h >> >similarity index 100% >> >rename from CryptoPkg/Include/sys/time.h rename to >> >CryptoPkg/Library/Include/sys/time.h >> >diff --git a/CryptoPkg/Include/sys/types.h >> >b/CryptoPkg/Library/Include/sys/types.h >> >similarity index 100% >> >rename from CryptoPkg/Include/sys/types.h rename to >> >CryptoPkg/Library/Include/sys/types.h >> >diff --git a/CryptoPkg/Include/syslog.h >> >b/CryptoPkg/Library/Include/syslog.h >> >similarity index 100% >> >rename from CryptoPkg/Include/syslog.h >> >rename to CryptoPkg/Library/Include/syslog.h >> >diff --git a/CryptoPkg/Include/time.h >> >b/CryptoPkg/Library/Include/time.h >> >similarity index 100% >> >rename from CryptoPkg/Include/time.h >> >rename to CryptoPkg/Library/Include/time.h diff --git >> >a/CryptoPkg/Include/unistd.h b/CryptoPkg/Library/Include/unistd.h >> >similarity index 100% >> >rename from CryptoPkg/Include/unistd.h >> >rename to CryptoPkg/Library/Include/unistd.h >> >diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl >> >b/CryptoPkg/Library/OpensslLib/process_files.pl >> >index 210811b9ed..716ecbf39a 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"; >> > >> >-- >> >2.12.2.windows.1