Browse Source

Linux 2.1 Open Source Gold release

Signed-off-by: Li, Xun <xun.li@intel.com>
Li, Xun 4 years ago
parent
commit
1ccf25b64a
100 changed files with 371 additions and 172 deletions
  1. 1 1
      License.txt
  2. 1 1
      Linux_SGXEclipsePlugin/build_directory/features/com.intel.sgx.feature/.project
  3. 1 1
      Linux_SGXEclipsePlugin/build_directory/features/com.intel.sgx.feature/build.properties
  4. 5 5
      Linux_SGXEclipsePlugin/build_directory/features/com.intel.sgx.feature/feature.xml
  5. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/.classpath
  6. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/.project
  7. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/build.properties
  8. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/html/Resources/Stylesheets/intel_css_styles.css
  9. 2 2
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/html/content.html
  10. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/plugin.xml
  11. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/src/com/intel/sgx/userguide/Activator.java
  12. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/toc.xml
  13. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/.classpath
  14. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/.project
  15. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/OSGI-INF/l10n/bundle.properties
  16. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/build.properties
  17. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/plugin.xml
  18. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/Activator.java
  19. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/CConfigurationDataProvider2.java
  20. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/Messages.java
  21. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/SdkPathVariableProvider.java
  22. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/build/SGXSDKCommandLauncher.java
  23. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/AddEnclaveFileDialog.java
  24. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/AddTrustedStaticLibFileDialog.java
  25. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/AddUntrustedModuleDialog.java
  26. 176 41
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/EnclaveConfigDialog.java
  27. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/RemoveEnclaveFileDialog.java
  28. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/SGXDialogBase.java
  29. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/TwoStepSignDialogBase.java
  30. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/TwoStepSignStep1Dialog1.java
  31. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/TwoStepSignStep1Dialog2.java
  32. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/TwoStepSignStep1Dialog3.java
  33. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/TwoStepSignStep2Dialog.java
  34. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/UpdateSignKeyDialog.java
  35. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/discovery/SGXSDKDiscoveredPathInfo.java
  36. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/discovery/SGXSDKDiscoveryUpdater.java
  37. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/discovery/SGXSDKScannerInfoCollector.java
  38. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/AddEnclave.java
  39. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/AddSGXNature.java
  40. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/AddTrustedStaticLib.java
  41. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/AddUntrustedModule.java
  42. 28 8
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/EnclaveConfigHandler.java
  43. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/ModuleCreationBaseHandler.java
  44. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/RemoveEnclave.java
  45. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/SGXHandler.java
  46. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/SGXSDKWizardHandler.java
  47. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/TwoStepSignHandlerBase.java
  48. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/TwoStepSignStep1.java
  49. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/TwoStepSignStep2.java
  50. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/UpdateSigningKey.java
  51. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/about.html
  52. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/messages.properties
  53. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/natures/SGXCCNature.java
  54. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/natures/SGXNature.java
  55. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/natures/SGXStaticCCNature.java
  56. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/preferences/ISDKDescriptor.java
  57. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/preferences/PreferenceConstants.java
  58. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/preferences/PreferenceInitializer.java
  59. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/preferences/SGXPreferencePage.java
  60. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/templates/CreateNativeFolders.java
  61. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/templates/SetCCNature.java
  62. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/templates/SetStaticCCNature.java
  63. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/testers/SGXPropertyTester.java
  64. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/wizards/SGXCCProjectWizard.java
  65. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/wizards/SGXCProjectWizard.java
  66. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c++/minimal/enclavetemplate.xml
  67. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c++/minimal/trustedstatictemplate.xml
  68. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c++/minimal/untrusted_module_template.xml
  69. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c++/with_sample/enclavetemplate.xml
  70. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c/minimal/enclavetemplate.xml
  71. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c/minimal/trustedstatictemplate.xml
  72. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c/minimal/untrusted_module_template.xml
  73. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c/with_sample/enclavetemplate.xml
  74. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/common/addnaturetemplate.xml
  75. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/configtemplate.xml
  76. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/ctemplate.xml
  77. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/cxxstaticlibtemplate.xml
  78. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/cxxtemplate.xml
  79. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/template.properties
  80. 8 3
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/resources/Basename.config.xml
  81. 6 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXEnclave/trusted/Enclave1.config.xml
  82. 1 1
      Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXEnclave/untrusted/sample.cpp
  83. 2 2
      Linux_SGXEclipsePlugin/build_directory/sites/site.xml
  84. 1 1
      Makefile
  85. 52 18
      README.md
  86. 1 1
      SampleCode/Cxx11SGXDemo/App/App.cpp
  87. 1 1
      SampleCode/Cxx11SGXDemo/App/App.h
  88. 1 1
      SampleCode/Cxx11SGXDemo/App/TrustedLibrary/Libcxx.cpp
  89. 1 1
      SampleCode/Cxx11SGXDemo/Enclave/Enclave.cpp
  90. 1 1
      SampleCode/Cxx11SGXDemo/Enclave/Enclave.edl
  91. 1 1
      SampleCode/Cxx11SGXDemo/Enclave/Enclave.h
  92. 1 1
      SampleCode/Cxx11SGXDemo/Enclave/TrustedLibrary/Libcxx.cpp
  93. 1 1
      SampleCode/Cxx11SGXDemo/Enclave/TrustedLibrary/Libcxx.edl
  94. 1 1
      SampleCode/Cxx11SGXDemo/Makefile
  95. 1 1
      SampleCode/LocalAttestation/App/App.cpp
  96. 1 1
      SampleCode/LocalAttestation/Enclave1/Enclave1.cpp
  97. 1 1
      SampleCode/LocalAttestation/Enclave1/Enclave1.edl
  98. 1 1
      SampleCode/LocalAttestation/Enclave1/Utility_E1.cpp
  99. 1 1
      SampleCode/LocalAttestation/Enclave1/Utility_E1.h
  100. 1 1
      SampleCode/LocalAttestation/Enclave2/Enclave2.cpp

+ 1 - 1
License.txt

@@ -1,6 +1,6 @@
 BSD License
 
-Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/features/com.intel.sgx.feature/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/features/com.intel.sgx.feature/build.properties

@@ -1,5 +1,5 @@
 #########################################################################
-# Copyright (c) 2016 Intel Corporation.				        #
+# Copyright (c) 2018 Intel Corporation.				        #
 # 								        #
 # All rights reserved. This program and the accompanying materials      #
 # are made available under the terms of the Eclipse Public License v1.0 #

+ 5 - 5
Linux_SGXEclipsePlugin/build_directory/features/com.intel.sgx.feature/feature.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->
@@ -16,7 +16,7 @@
       version="1.0.1.qualifier"
       provider-name="INTEL">
 
-   <description url="http://fso-dev-machine.ed.intel.com">
+   <description>
       The Intel(R) Software Guard Extensions Plug-in enables Independent Service
 Vendors in developing Linux applications
 with Intel(R) Software Guard Extensions. The Plug-in extends the C/C++ Development
@@ -32,11 +32,11 @@ and the Linux project using the Intel(R) SGX SDK for Linux with Release/Debug Co
 mode and Hardware Prerelease mode.
    </description>
 
-   <copyright url="http://fso-dev-machine.ed.intel.com/copyright">
+   <copyright>
       All rights reserved with Intel Corporation and its Licensors.
    </copyright>
 
-   <license url="http://fso-dev-machine.ed.intel.com/license">
+   <license>
       Eclipse Public License - v 1.0
 
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
@@ -110,7 +110,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
    </license>
 
    <url>
-      <update label="Intel(R) Software Guard Extensions Eclipse Plug-in" url="http://fso-dev-machine.rd.intel.com/sgx"/>
+      <update label="Intel(R) Software Guard Extensions Eclipse Plug-in" url="https://download.01.org/intel-sgx"/>
    </url>
 
    <requires>

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/build.properties

@@ -1,5 +1,5 @@
 #########################################################################
-# Copyright (c) 2016 Intel Corporation.				        #
+# Copyright (c) 2018 Intel Corporation.				        #
 # 								        #
 # All rights reserved. This program and the accompanying materials      #
 # are made available under the terms of the Eclipse Public License v1.0 #

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/html/Resources/Stylesheets/intel_css_styles.css

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/* Copyright (c) 2016 Intel Corporation.				 */
+/* Copyright (c) 2018 Intel Corporation.				 */
 /* 									 */
 /* All rights reserved. This program and the accompanying materials	 */
 /* are made available under the terms of the Eclipse Public License v1.0 */

+ 2 - 2
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/html/content.html

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!-- 
- Copyright (c) 2016 Intel Corporation.
+ Copyright (c) 2018 Intel Corporation.
 
  All rights reserved. This program and the accompanying materials
  are made available under the terms of the Eclipse Public License v1.0
@@ -77,7 +77,7 @@ developers by the Intel(R) SGX SDK.</p>
             </tr>
         </table>
         <p>* Other names and brands may be claimed as the property of others.</p>
-        <p>© 2016 Intel Corporation.</p>
+        <p>© 2018 Intel Corporation.</p>
     </div>
     <div id='Introduction'>
         <h1>Introduction</h1>

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/src/com/intel/sgx/userguide/Activator.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/toc.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!-- 
- Copyright (c) 2016 Intel Corporation.
+ Copyright (c) 2018 Intel Corporation.
 
  All rights reserved. This program and the accompanying materials
  are made available under the terms of the Eclipse Public License v1.0

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/OSGI-INF/l10n/bundle.properties

@@ -1,5 +1,5 @@
 #########################################################################
-# Copyright (c) 2016 Intel Corporation.				        #
+# Copyright (c) 2018 Intel Corporation.				        #
 # 								        #
 # All rights reserved. This program and the accompanying materials      #
 # are made available under the terms of the Eclipse Public License v1.0 #

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/build.properties

@@ -1,5 +1,5 @@
 #########################################################################
-# Copyright (c) 2016 Intel Corporation.				        #
+# Copyright (c) 2018 Intel Corporation.				        #
 # 								        #
 # All rights reserved. This program and the accompanying materials      #
 # are made available under the terms of the Eclipse Public License v1.0 #

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/Activator.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/CConfigurationDataProvider2.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/Messages.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/SdkPathVariableProvider.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/build/SGXSDKCommandLauncher.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/AddEnclaveFileDialog.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/AddTrustedStaticLibFileDialog.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/AddUntrustedModuleDialog.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 176 - 41
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/EnclaveConfigDialog.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //
@@ -42,9 +42,14 @@ public class EnclaveConfigDialog extends SGXDialogBase {
 	private Label statusLabel;
 	private Text prodID;
 	private Text isvSvn;
-	private Text threadStackSize;
-	private Text globalHeapSize;
+	private Text stackMinSize;
+	private Text stackMaxSize;
+	private Text heapMinSize;
+	private Text heapInitSize;
+	private Text heapMaxSize;
 	private Text tcsNum;
+	private Text tcsMaxNum;
+	private Text tcsPool;
 	private Combo tcsPolicy;
 	private Button disableDebug;
 	
@@ -119,60 +124,124 @@ public class EnclaveConfigDialog extends SGXDialogBase {
 		});
 		
 		final Label messageLabel2 = new Label(groupLabel2, SWT.NONE);
-		messageLabel2.setText("Thread Stack Size:");
+		messageLabel2.setText("Minimum Stack Size:");
 		messageLabel2.setLayoutData(new GridData(GridData.BEGINNING));
 		
-		threadStackSize = new Text(groupLabel2, SWT.SINGLE | SWT.BORDER);
-		threadStackSize.setLayoutData(gridData);
-		threadStackSize.setText(enclaveConfig.threadStackSize);
-		threadStackSize.addModifyListener(new ModifyListener() {
+		stackMinSize = new Text(groupLabel2, SWT.SINGLE | SWT.BORDER);
+		stackMinSize.setLayoutData(gridData);
+		stackMinSize.setText(enclaveConfig.stackMinSize);
+		stackMinSize.addModifyListener(new ModifyListener() {
 			@Override
 			public void modifyText(ModifyEvent modifyEvent) {
-				enclaveConfig.threadStackSize = threadStackSize.getText();
-				if(!(threadStackSize.getText().matches("0x[0-9a-fA-F]{1,}000")))
+				enclaveConfig.stackMinSize = stackMinSize.getText();
+
+				if(!(stackMinSize.getText().matches("0x[0-9a-fA-F]{1,}000")))
 				{
-					statusLabel.setText("Error: The Thread Stack Size value must be Page Aligned.");
+					statusLabel.setText("Error: The Minimum Stack Size value must be Page Aligned.");
 				}
 				else
 				{
-					if(!(enclaveConfig.globalHeapSize.matches("0x[0-9a-fA-F]{1,}000")))
-						statusLabel.setText("Error: The Global Heap Size value must be Page Aligned.");
-					else
-						statusLabel.setText("");
+					checkPageAlign(stackMinSize);
 				}
 			}
 		});
-		
+
 		final Label messageLabel3 = new Label(groupLabel2, SWT.NONE);
-		messageLabel3.setText("Global Heap Size:");
+		messageLabel3.setText("Maximum Stack Size:");
 		messageLabel3.setLayoutData(new GridData(GridData.BEGINNING));
 		
-		globalHeapSize = new Text(groupLabel2, SWT.SINGLE | SWT.BORDER);
-		globalHeapSize.setLayoutData(gridData);
-		globalHeapSize.setText(enclaveConfig.globalHeapSize);
-		globalHeapSize.addModifyListener(new ModifyListener() {
+		stackMaxSize = new Text(groupLabel2, SWT.SINGLE | SWT.BORDER);
+		stackMaxSize.setLayoutData(gridData);
+		stackMaxSize.setText(enclaveConfig.stackMaxSize);
+		stackMaxSize.addModifyListener(new ModifyListener() {
 			@Override
 			public void modifyText(ModifyEvent modifyEvent) {
-				enclaveConfig.globalHeapSize = globalHeapSize.getText();
-				if(!(globalHeapSize.getText().matches("0x[0-9a-fA-F]{1,}000")))
+				enclaveConfig.stackMaxSize = stackMaxSize.getText();
+
+				if(!(stackMaxSize.getText().matches("0x[0-9a-fA-F]{1,}000")))
 				{
-					statusLabel.setText("Error: The Global Heap Size value must be Page Aligned.");
+					statusLabel.setText("Error: The Maximum Stack Size value must be Page Aligned.");
 				}
 				else
 				{
-					if(!(enclaveConfig.threadStackSize.matches("0x[0-9a-fA-F]{1,}000")))
-						statusLabel.setText("Error: The Thread Stack Size value must be Page Aligned.");
-					else
-						statusLabel.setText("");
-					
+					checkPageAlign(stackMaxSize);
 				}
 			}
 		});
-		
+
 		final Label messageLabel4 = new Label(groupLabel2, SWT.NONE);
-		messageLabel4.setText("TCS Number:");
+		messageLabel4.setText("Minimum Heap Size:");
 		messageLabel4.setLayoutData(new GridData(GridData.BEGINNING));
 		
+		heapMinSize = new Text(groupLabel2, SWT.SINGLE | SWT.BORDER);
+		heapMinSize.setLayoutData(gridData);
+		heapMinSize.setText(enclaveConfig.heapMinSize);
+		heapMinSize.addModifyListener(new ModifyListener() {
+			@Override
+			public void modifyText(ModifyEvent modifyEvent) {
+				enclaveConfig.heapMinSize = heapMinSize.getText();
+
+				if(!(heapMinSize.getText().matches("0x[0-9a-fA-F]{1,}000")))
+				{
+					statusLabel.setText("Error: The Minimum Heap Size value must be Page Aligned.");
+				}
+				else
+				{
+					checkPageAlign(heapMinSize);
+				}
+			}
+		});
+
+		final Label messageLabel5 = new Label(groupLabel2, SWT.NONE);
+		messageLabel5.setText("Initial Heap Size:");
+		messageLabel5.setLayoutData(new GridData(GridData.BEGINNING));
+		
+		heapInitSize = new Text(groupLabel2, SWT.SINGLE | SWT.BORDER);
+		heapInitSize.setLayoutData(gridData);
+		heapInitSize.setText(enclaveConfig.heapInitSize);
+		heapInitSize.addModifyListener(new ModifyListener() {
+			@Override
+			public void modifyText(ModifyEvent modifyEvent) {
+				enclaveConfig.heapInitSize = heapInitSize.getText();
+
+				if(!(heapInitSize.getText().matches("0x[0-9a-fA-F]{1,}000")))
+				{
+					statusLabel.setText("Error: The Initial Heap Size value must be Page Aligned.");
+				}
+				else
+				{
+					checkPageAlign(heapInitSize);
+				}
+			}
+		});
+		
+		final Label messageLabel6 = new Label(groupLabel2, SWT.NONE);
+		messageLabel6.setText("Maximum Heap Size:");
+		messageLabel6.setLayoutData(new GridData(GridData.BEGINNING));
+		
+		heapMaxSize = new Text(groupLabel2, SWT.SINGLE | SWT.BORDER);
+		heapMaxSize.setLayoutData(gridData);
+		heapMaxSize.setText(enclaveConfig.heapMaxSize);
+		heapMaxSize.addModifyListener(new ModifyListener() {
+			@Override
+			public void modifyText(ModifyEvent modifyEvent) {
+				enclaveConfig.heapMaxSize = heapMaxSize.getText();
+
+				if(!(heapMaxSize.getText().matches("0x[0-9a-fA-F]{1,}000")))
+				{
+					statusLabel.setText("Error: The Maximum Heap Size value must be Page Aligned.");
+				}
+				else
+				{
+					checkPageAlign(heapMaxSize);
+				}
+			}
+		});
+		
+		final Label messageLabel7 = new Label(groupLabel2, SWT.NONE);
+		messageLabel7.setText("TCS Number:");
+		messageLabel7.setLayoutData(new GridData(GridData.BEGINNING));
+		
 		tcsNum = new Text(groupLabel2, SWT.SINGLE | SWT.BORDER);	
 		tcsNum.setLayoutData(gridData);
 		tcsNum.setText(enclaveConfig.tcsNum);
@@ -184,9 +253,39 @@ public class EnclaveConfigDialog extends SGXDialogBase {
 			}
 		});
 		
-		final Label messageLabel5 = new Label(groupLabel2, SWT.NONE);
-		messageLabel5.setText("TCS Policy:");
-		messageLabel5.setLayoutData(new GridData(GridData.BEGINNING));
+		final Label messageLabel8 = new Label(groupLabel2, SWT.NONE);
+		messageLabel8.setText("Maximum TCS Number:");
+		messageLabel8.setLayoutData(new GridData(GridData.BEGINNING));
+		
+		tcsMaxNum = new Text(groupLabel2, SWT.SINGLE | SWT.BORDER);	
+		tcsMaxNum.setLayoutData(gridData);
+		tcsMaxNum.setText(enclaveConfig.tcsMaxNum);
+		tcsMaxNum.addModifyListener(new ModifyListener() {
+			@Override
+			public void modifyText(ModifyEvent modifyEvent) {
+				statusLabel.setText("");
+				enclaveConfig.tcsMaxNum = tcsMaxNum.getText();
+			}
+		});
+		
+		final Label messageLabel9 = new Label(groupLabel2, SWT.NONE);
+		messageLabel9.setText("TCS Pool:");
+		messageLabel9.setLayoutData(new GridData(GridData.BEGINNING));
+		
+		tcsPool = new Text(groupLabel2, SWT.SINGLE | SWT.BORDER);	
+		tcsPool.setLayoutData(gridData);
+		tcsPool.setText(enclaveConfig.tcsPool);
+		tcsPool.addModifyListener(new ModifyListener() {
+			@Override
+			public void modifyText(ModifyEvent modifyEvent) {
+				statusLabel.setText("");
+				enclaveConfig.tcsPool = tcsPool.getText();
+			}
+		});
+		
+		final Label messageLabel10 = new Label(groupLabel2, SWT.NONE);
+		messageLabel10.setText("TCS Policy:");
+		messageLabel10.setLayoutData(new GridData(GridData.BEGINNING));
 		
 		final String[] items = {"Unbound","Bound"};
 		tcsPolicy = new Combo(groupLabel2, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
@@ -203,9 +302,9 @@ public class EnclaveConfigDialog extends SGXDialogBase {
 		});
 		
 		
-		final Label messageLabel6 = new Label(groupLabel2, SWT.NONE);
-		messageLabel6.setText("Disable Debug:");
-		messageLabel6.setLayoutData(new GridData(GridData.BEGINNING));
+		final Label messageLabel11 = new Label(groupLabel2, SWT.NONE);
+		messageLabel11.setText("Disable Debug:");
+		messageLabel11.setLayoutData(new GridData(GridData.BEGINNING));
 		
 		disableDebug = new Button(groupLabel2,SWT.CHECK);
 		GridData gridData1 = new GridData(GridData.FILL_HORIZONTAL);
@@ -236,7 +335,7 @@ public class EnclaveConfigDialog extends SGXDialogBase {
 	
 	@Override
 	protected Point getInitialSize(){
-		return new Point(450,400);
+		return new Point(450,570);
 	}
 	
 	@Override
@@ -244,14 +343,50 @@ public class EnclaveConfigDialog extends SGXDialogBase {
 	void okPressed(){
 		enclaveConfig.prodId = this.prodID.getText();
 		enclaveConfig.isvSvn = this.isvSvn.getText();
-		enclaveConfig.threadStackSize = this.threadStackSize.getText();
-		enclaveConfig.globalHeapSize = this.globalHeapSize.getText();
+		enclaveConfig.stackMinSize = this.stackMinSize.getText();
+		enclaveConfig.stackMaxSize = this.stackMaxSize.getText();
+		enclaveConfig.heapMinSize = this.heapMinSize.getText();
+		enclaveConfig.heapInitSize = this.heapInitSize.getText();
+		enclaveConfig.heapMaxSize = this.heapMaxSize.getText();
 		enclaveConfig.tcsNum =  this.tcsNum.getText();
+		enclaveConfig.tcsMaxNum =  this.tcsMaxNum.getText();
+		enclaveConfig.tcsPool =  this.tcsPool.getText();
 		enclaveConfig.tcsPolicy = this.tcsPolicy.getSelectionIndex() == 0 ? "0" : "1";
 		enclaveConfig.disableDebug = disableDebug.getSelection()?"1":"0";
 
 		
-		if((statusLabel.getText() == "") && (enclaveConfig.globalHeapSize.matches("0x[0-9a-fA-F]{1,}000")) && (enclaveConfig.threadStackSize.matches("0x[0-9a-fA-F]{1,}000")))
+		if((statusLabel.getText() == "") && (enclaveConfig.stackMinSize.matches("0x[0-9a-fA-F]{1,}000"))
+				&& (enclaveConfig.stackMaxSize.matches("0x[0-9a-fA-F]{1,}000"))
+				&& (enclaveConfig.heapMinSize.matches("0x[0-9a-fA-F]{1,}000"))
+				&& (enclaveConfig.heapInitSize.matches("0x[0-9a-fA-F]{1,}000"))
+				&& (enclaveConfig.heapMaxSize.matches("0x[0-9a-fA-F]{1,}000")))
 			super.okPressed();
 	}
+	
+	private void checkPageAlign(Text txtExcluded) {
+		if(txtExcluded != stackMinSize && !(enclaveConfig.stackMinSize.matches("0x[0-9a-fA-F]{1,}000")))
+		{
+			statusLabel.setText("Error: The Minimum Stack Size value must be Page Aligned.");
+		}
+		else if(txtExcluded != stackMaxSize && !(enclaveConfig.stackMaxSize.matches("0x[0-9a-fA-F]{1,}000")))
+		{
+			statusLabel.setText("Error: The Maximum Stack Size value must be Page Aligned.");
+		}
+		else if(txtExcluded != heapMinSize && !(enclaveConfig.heapMinSize.matches("0x[0-9a-fA-F]{1,}000")))
+		{
+			statusLabel.setText("Error: The Minimum Heap Size value must be Page Aligned.");
+		}
+		else if(txtExcluded != heapInitSize && !(enclaveConfig.heapInitSize.matches("0x[0-9a-fA-F]{1,}000")))
+		{
+			statusLabel.setText("Error: The Initial Heap Size value must be Page Aligned.");
+		}
+		else if(txtExcluded != heapMaxSize && !(enclaveConfig.heapMaxSize.matches("0x[0-9a-fA-F]{1,}000")))
+		{
+			statusLabel.setText("Error: The Maximum Heap Size value must be Page Aligned.");
+		}
+		else
+		{
+			statusLabel.setText("");
+		}
+	}
 }

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/RemoveEnclaveFileDialog.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/SGXDialogBase.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/TwoStepSignDialogBase.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/TwoStepSignStep1Dialog1.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/TwoStepSignStep1Dialog2.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/TwoStepSignStep1Dialog3.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/TwoStepSignStep2Dialog.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/dialogs/UpdateSignKeyDialog.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/discovery/SGXSDKDiscoveredPathInfo.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/discovery/SGXSDKDiscoveryUpdater.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/discovery/SGXSDKScannerInfoCollector.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/AddEnclave.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/AddSGXNature.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/AddTrustedStaticLib.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/AddUntrustedModule.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 28 - 8
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/EnclaveConfigHandler.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //
@@ -46,9 +46,14 @@ public class EnclaveConfigHandler extends SGXHandler {
 
 	public String prodId;
 	public String isvSvn;
-	public String threadStackSize;
-	public String globalHeapSize;
+	public String stackMinSize;
+	public String stackMaxSize;
+	public String heapMinSize;
+	public String heapInitSize;
+	public String heapMaxSize;
 	public String tcsNum;
+	public String tcsMaxNum;
+	public String tcsPool;
 	public String tcsPolicy;
 	public String disableDebug;
 	private IFile configPath;
@@ -93,9 +98,14 @@ public class EnclaveConfigHandler extends SGXHandler {
 		valueStore.put("configFile", configPath.getProjectRelativePath().toOSString());
 		valueStore.put("ProdID", this.prodId);
 		valueStore.put("IsvSvn", this.isvSvn);
-		valueStore.put("ThreadStackSize", this.threadStackSize);
-		valueStore.put("GlobalHeapSize", this.globalHeapSize);
-		valueStore.put("TcsNumber", this.tcsNum);
+		valueStore.put("StackMinSize", this.stackMinSize);
+		valueStore.put("StackMaxSize", this.stackMaxSize);
+		valueStore.put("HeapMinSize", this.heapMinSize);
+		valueStore.put("HeapInitSize", this.heapInitSize);
+		valueStore.put("HeapMaxSize", this.heapMaxSize);
+		valueStore.put("TcsNum", this.tcsNum);
+		valueStore.put("TcsMaxNum", this.tcsMaxNum);
+		valueStore.put("TcsMinPool", this.tcsPool);
 		valueStore.put("TcsPolicy", this.tcsPolicy);
 		valueStore.put("DisableDebug", this.disableDebug);
 		IStatus[] result = template.executeTemplateProcesses(monitor, true);
@@ -126,12 +136,22 @@ public class EnclaveConfigHandler extends SGXHandler {
 						.getTextContent();
 				this.isvSvn = e.getElementsByTagName("ISVSVN").item(0)
 						.getTextContent();
-				this.threadStackSize = e.getElementsByTagName("StackMaxSize")
+				this.stackMinSize = e.getElementsByTagName("StackMinSize")
 						.item(0).getTextContent();
-				this.globalHeapSize = e.getElementsByTagName("HeapMaxSize")
+				this.stackMaxSize = e.getElementsByTagName("StackMaxSize")
+						.item(0).getTextContent();
+				this.heapMinSize = e.getElementsByTagName("HeapMinSize")
+						.item(0).getTextContent();
+				this.heapInitSize = e.getElementsByTagName("HeapInitSize")
+						.item(0).getTextContent();
+				this.heapMaxSize = e.getElementsByTagName("HeapMaxSize")
 						.item(0).getTextContent();
 				this.tcsNum = e.getElementsByTagName("TCSNum").item(0)
 						.getTextContent();
+				this.tcsMaxNum = e.getElementsByTagName("TCSMaxNum").item(0)
+						.getTextContent();
+				this.tcsPool = e.getElementsByTagName("TCSMinPool").item(0)
+						.getTextContent();
 				this.tcsPolicy = e.getElementsByTagName("TCSPolicy").item(0)
 						.getTextContent();
 				this.disableDebug = e.getElementsByTagName("DisableDebug")

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/ModuleCreationBaseHandler.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/RemoveEnclave.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/SGXHandler.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/SGXSDKWizardHandler.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/TwoStepSignHandlerBase.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/TwoStepSignStep1.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/TwoStepSignStep2.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/UpdateSigningKey.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/handlers/about.html

@@ -1,5 +1,5 @@
 <!--------------------------------------------------------------------------->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/messages.properties

@@ -1,5 +1,5 @@
 #########################################################################
-# Copyright (c) 2016 Intel Corporation.				        #
+# Copyright (c) 2018 Intel Corporation.				        #
 # 								        #
 # All rights reserved. This program and the accompanying materials      #
 # are made available under the terms of the Eclipse Public License v1.0 #

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/natures/SGXCCNature.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/natures/SGXNature.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/natures/SGXStaticCCNature.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/preferences/ISDKDescriptor.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/preferences/PreferenceConstants.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/preferences/PreferenceInitializer.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/preferences/SGXPreferencePage.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/templates/CreateNativeFolders.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/templates/SetCCNature.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/templates/SetStaticCCNature.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/testers/SGXPropertyTester.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/wizards/SGXCCProjectWizard.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/src/com/intel/sgx/wizards/SGXCProjectWizard.java

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2016 Intel Corporation.				 //
+// Copyright (c) 2018 Intel Corporation.				 //
 // 									 //
 // All rights reserved. This program and the accompanying materials	 //
 // are made available under the terms of the Eclipse Public License v1.0 //

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c++/minimal/enclavetemplate.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c++/minimal/trustedstatictemplate.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c++/minimal/untrusted_module_template.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c++/with_sample/enclavetemplate.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c/minimal/enclavetemplate.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c/minimal/trustedstatictemplate.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c/minimal/untrusted_module_template.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/c/with_sample/enclavetemplate.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/common/addnaturetemplate.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/configtemplate.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/ctemplate.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/cxxstaticlibtemplate.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/cxxtemplate.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/SGXtemplates/template.properties

@@ -1,5 +1,5 @@
 #########################################################################
-# Copyright (c) 2016 Intel Corporation.				        #
+# Copyright (c) 2018 Intel Corporation.				        #
 # 								        #
 # All rights reserved. This program and the accompanying materials      #
 # are made available under the terms of the Eclipse Public License v1.0 #

+ 8 - 3
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/resources/Basename.config.xml

@@ -1,9 +1,14 @@
 <EnclaveConfiguration>
   <ProdID>$(ProdID)</ProdID>
   <ISVSVN>$(IsvSvn)</ISVSVN>
-  <StackMaxSize>$(ThreadStackSize)</StackMaxSize>
-  <HeapMaxSize>$(GlobalHeapSize)</HeapMaxSize>
-  <TCSNum>$(TcsNumber)</TCSNum>
+  <StackMinSize>$(StackMinSize)</StackMinSize>
+  <StackMaxSize>$(StackMaxSize)</StackMaxSize>
+  <HeapMinSize>$(HeapMinSize)</HeapMinSize>
+  <HeapInitSize>$(HeapInitSize)</HeapInitSize>
+  <HeapMaxSize>$(HeapMaxSize)</HeapMaxSize>
+  <TCSMaxNum>$(TcsMaxNum)</TCSMaxNum>
+  <TCSNum>$(TcsNum)</TCSNum>
+  <TCSMinPool>$(TcsMinPool)</TCSMinPool>
   <TCSPolicy>$(TcsPolicy)</TCSPolicy>
   <DisableDebug>$(DisableDebug)</DisableDebug>
 </EnclaveConfiguration>

+ 6 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXEnclave/trusted/Enclave1.config.xml

@@ -1,9 +1,14 @@
 <EnclaveConfiguration>
   <ProdID>0</ProdID>
   <ISVSVN>0</ISVSVN>
+  <StackMinSize>0x1000</StackMinSize>
   <StackMaxSize>0x40000</StackMaxSize>
-  <HeapMaxSize>0x100000</HeapMaxSize>
+  <HeapMinSize>0x1000</HeapMinSize>
+  <HeapInitSize>0x1000000</HeapInitSize>
+  <HeapMaxSize>0x1000000</HeapMaxSize>
+  <TCSMaxNum>10</TCSMaxNum>
   <TCSNum>10</TCSNum>
+  <TCSMinPool>3</TCSMinPool>
   <TCSPolicy>1</TCSPolicy>
   <DisableDebug>0</DisableDebug>
 </EnclaveConfiguration>

+ 1 - 1
Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXEnclave/untrusted/sample.cpp

@@ -120,7 +120,7 @@ void print_error_message(sgx_status_t ret)
     }
     
     if (idx == ttl)
-        printf("Error: Unexpected error occurred.\n");
+        printf("Error code is 0x%X. Please refer to the \"Intel SGX SDK Developer Reference\" for more details.\n", ret);
 }
 
 /* Initialize the enclave:

+ 2 - 2
Linux_SGXEclipsePlugin/build_directory/sites/site.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--                                                                       -->
-<!-- Copyright (c) 2016 Intel Corporation.				   -->
+<!-- Copyright (c) 2018 Intel Corporation.				   -->
 <!-- 									   -->
 <!-- All rights reserved. This program and the accompanying materials	   -->
 <!-- are made available under the terms of the Eclipse Public License v1.0 -->
@@ -11,7 +11,7 @@
 <!--     Intel Corporation - initial implementation and documentation	   -->
 <!--                                                                       -->
 <site>
-   <description name="Intel(R) Software Guard Extensions Plug-in" url="http://fso-dev-machine.rd.intel.com/sgx">
+   <description name="Intel(R) Software Guard Extensions Plug-in" url="https://download.01.org/intel-sgx">
       This website hosts an evaluation version of the Eclipse Plug-in developed for Secure Guard Extensions Application development for Linux platforms.
    </description>
    <feature url="features/com.intel.sgx.feature_1.0.1.qualifier.jar" id="com.intel.sgx.feature" version="1.0.1.qualifier">

+ 1 - 1
Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+# Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

+ 52 - 18
README.md

@@ -11,6 +11,8 @@ The Linux\* Intel(R) SGX software stack is comprised of the Intel(R) SGX driver,
 
 The [linux-sgx-driver](https://github.com/01org/linux-sgx-driver) project hosts the out-of-tree driver for the Linux\* Intel(R) SGX software stack, which will be used until the driver upstreaming process is complete. 
 
+The repository provides a reference implementation of a Launch Enclave for 'Flexible Launch Control' under [psw/ae/ref_le](psw/ae/ref_le). The reference LE implemenation can be used as a basis for enforcing different launch control policy by the platform developer or owner. To build and try it by yourself, please refer to the [ref_le.md](psw/ae/ref_le/ref_le.md) for details.
+
 License
 -------
 See [License.txt](License.txt) for details.
@@ -28,35 +30,44 @@ Build and Install the Intel(R) SGX Driver
 -----------------------------------------
 Follow the instructions in the [linux-sgx-driver](https://github.com/01org/linux-sgx-driver) project to build and install the Intel(R) SGX driver.
 
-**Note:** **SGX 2.0** feature support in the SDK and PSW depends on processor and driver support for the SGX 2.0 instruction set. Please consult the README in the driver for instructions on building the SGX 2.0 Linux Driver. Upcoming CPU releases will include hardware support for SGX 2.0.
-
 Build the Intel(R) SGX SDK and Intel(R) SGX PSW Package
 -------------------------------------------------------
 ### Prerequisites:
 - Ensure that you have one of the following required operating systems:  
-  * Ubuntu\* Desktop-16.04-LTS 64bits
+  * Ubuntu\* 16.04.3 LTS Desktop 64bits
+  * Ubuntu\* 16.04.3 LTS Server 64bits
   * Red Hat Enterprise Linux Server release 7.4 64bits
-  * CentOS 7.3.1611 64bits
+  * CentOS 7.4.1708 64bits
+  * SUSE Linux Enterprise Server 12 64bits
 
 - Use the following command(s) to install the required tools to build the Intel(R) SGX SDK:  
   * On Ubuntu 16.04:
   ```
     $ sudo apt-get install build-essential ocaml automake autoconf libtool wget python
   ```
-  * On Red Hat Enterprise Linux 7.4 and CentOS 7.3:
+  * On Red Hat Enterprise Linux 7.4 and CentOS 7.4:
   ```
     $ sudo yum groupinstall 'Development Tools'
     $ sudo yum install ocaml wget python
   ```
+  * On SUSE Linux Enterprise Server 12:
+  ```
+    $ sudo zypper install --type pattern devel_basis
+    $ sudo zypper install ocaml ocaml-ocamlbuild automake autoconf libtool wget python
+  ```
 - Use the following command to install additional required tools to build the Intel(R) SGX PSW:  
   * On Ubuntu 16.04:
   ```
     $ sudo apt-get install libssl-dev libcurl4-openssl-dev protobuf-compiler libprotobuf-dev
   ```
-  * On Red Hat Enterprise Linux 7.4 and CentOS 7.3:
+  * On Red Hat Enterprise Linux 7.4 and CentOS 7.4:
   ```
     $ sudo yum install openssl-devel libcurl-devel protobuf-devel
   ```
+  * On SUSE Linux Enterprise Server 12:
+  ```
+    $ sudo zypper install libopenssl-devel libcurl-devel protobuf-devel
+  ```
 - Use the script ``download_prebuilt.sh`` inside source code package to download prebuilt binaries to prebuilt folder  
   You may need set an https proxy for the `wget` tool used by the script (such as ``export https_proxy=http://test-proxy:test-port``)  
 ```
@@ -125,19 +136,26 @@ Install the Intel(R) SGX SDK
 ------------------------
 ### Prerequisites
 - Ensure that you have one of the following operating systems:  
-  * Ubuntu\* Desktop-16.04-LTS 64bits
+  * Ubuntu\* 16.04.3 LTS Desktop 64bits
+  * Ubuntu\* 16.04.3 LTS Server 64bits
   * Red Hat Enterprise Linux Server release 7.4 64bits
-  * CentOS 7.3.1611 64bits
+  * CentOS 7.4.1708 64bits
+  * SUSE Linux Enterprise Server 12 64bits
 - Use the following command to install the required tool to use Intel(R) SGX SDK:
   * On Ubuntu 16.04:
   ```  
     $ sudo apt-get install build-essential python
   ```
-  * On Red Hat Enterprise Linux 7.4 and CentOS 7.3:
+  * On Red Hat Enterprise Linux 7.4 and CentOS 7.4:
   ```
      $ sudo yum groupinstall 'Development Tools'
      $ sudo yum install python 
   ```
+  * On SUSE Linux Enterprise Server 12:
+  ```
+     $ sudo zypper install --type pattern devel_basis
+     $ sudo zypper install python 
+  ```
 
 ### Install the Intel(R) SGX SDK
 To install the Intel(R) SGX SDK, invoke the installer, as follows:
@@ -145,10 +163,11 @@ To install the Intel(R) SGX SDK, invoke the installer, as follows:
 $ cd linux/installer/bin
 $ ./sgx_linux_x64_sdk_${version}.bin 
 ```
-NOTE: You need to set up the needed environment variables before compiling your code. To do so, run:
-```
-   $ source ${sgx-sdk-install-path}/environment
-```
+NOTE: You need to set up the needed environment variables before compiling your code. To do so, run:  
+```  
+  $ source ${sgx-sdk-install-path}/environment  
+```  
+
 ### Test the Intel(R) SGX SDK Package with the Code Samples
 - Compile and run each code sample in Simulation mode to make sure the package works well:    
 ```
@@ -175,9 +194,11 @@ Install the Intel(R) SGX PSW
 ----------------------------
 ### Prerequisites
 - Ensure that you have one of the following operating systems:  
-  * Ubuntu\* Desktop-16.04-LTS 64bits
+  * Ubuntu\* 16.04.3 LTS Desktop 64bits
+  * Ubuntu\* 16.04.3 LTS Server 64bits
   * Red Hat Enterprise Linux Server release 7.4 64bits
-  * CentOS 7.3.1611 64bits
+  * CentOS 7.4.1708 64bits
+  * SUSE Linux Enterprise Server 12 64bits
 - Ensure that you have a system with the following required hardware:  
   * 6th Generation Intel(R) Core(TM) Processor or newer
 - Configure the system with the **Intel SGX hardware enabled** option and install Intel(R) SGX driver in advance.  
@@ -187,10 +208,14 @@ Install the Intel(R) SGX PSW
   ```
     $ sudo apt-get install libssl-dev libcurl4-openssl-dev libprotobuf-dev
   ```
-  * On Red Hat Enterprise Linux 7.4 and CentOS 7.3:  
+  * On Red Hat Enterprise Linux 7.4 and CentOS 7.4:  
   ```
     $ sudo yum install openssl-devel libcurl-devel protobuf-devel
   ```
+  * On SUSE Linux Enterprise Server 12:  
+  ```
+    $ sudo zypper install libopenssl-devel libcurl-devel protobuf-devel
+  ```
 - To use Trusted Platform Service functions:  
   Ensure `mei_me` driver is enabled and `/dev/mei0` exists.  
   Download [iclsClient](https://software.intel.com/en-us/sgx-sdk/download) and install it using the following commands:  
@@ -200,21 +225,30 @@ Install the Intel(R) SGX PSW
     $ sudo alien --scripts iclsClient-1.45.449.12-1.x86_64.rpm
     $ sudo dpkg -i iclsclient_1.45.449.12-2_amd64.deb
   ```
-  * On Red Hat Enterprise Linux 7.4 and CentOS 7.3:  
+  * On Red Hat Enterprise Linux 7.4 and CentOS 7.4:  
   ```
     $ sudo yum install iclsClient-1.45.449.12-1.x86_64.rpm
   ```
+  * On SUSE Linux Enterprise Server 12:  
+  ```
+    $ sudo zypper install iclsClient-1.45.449.12-1.x86_64.rpm
+  ```
   Download source code from [dynamic-application-loader-host-interface](https://github.com/01org/dynamic-application-loader-host-interface) project. In the source code folder, build and install the `JHI` service using the following commands:
   * On Ubuntu 16.04:
   ```
     $ sudo apt-get install uuid-dev libxml2-dev cmake pkg-config
     $ cmake .;make;sudo make install;sudo systemctl enable jhi
   ```
-  * On Red Hat Enterprise Linux 7.4 and CentOS 7.3:  
+  * On Red Hat Enterprise Linux 7.4 and CentOS 7.4:  
   ```
     $ sudo yum install libuuid-devel libxml2-devel cmake pkgconfig
     $ cmake .;make;sudo make install;sudo ldconfig;sudo systemctl enable jhi
   ```
+  * On SUSE Linux Enterprise Server 12:  
+  ```
+    $ sudo zypper install libuuid-devel libxml2-devel cmake pkg-config
+    $ cmake .;make;sudo make install;sudo ldconfig;sudo systemctl enable jhi
+  ```
 
 ### Install the Intel(R) SGX PSW
 To install the Intel(R) SGX PSW, invoke the installer with root privilege:  

+ 1 - 1
SampleCode/Cxx11SGXDemo/App/App.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/Cxx11SGXDemo/App/App.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/Cxx11SGXDemo/App/TrustedLibrary/Libcxx.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/Cxx11SGXDemo/Enclave/Enclave.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/Cxx11SGXDemo/Enclave/Enclave.edl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/Cxx11SGXDemo/Enclave/Enclave.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/Cxx11SGXDemo/Enclave/TrustedLibrary/Libcxx.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/Cxx11SGXDemo/Enclave/TrustedLibrary/Libcxx.edl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/Cxx11SGXDemo/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+# Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/LocalAttestation/App/App.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/LocalAttestation/Enclave1/Enclave1.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/LocalAttestation/Enclave1/Enclave1.edl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/LocalAttestation/Enclave1/Utility_E1.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/LocalAttestation/Enclave1/Utility_E1.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

+ 1 - 1
SampleCode/LocalAttestation/Enclave2/Enclave2.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011-2018 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Some files were not shown because too many files changed in this diff