Update Linux_SGXEclipsePlugin

Signed-off-by: Li, Xun <xun.li@intel.com>

Linux_SGXEclipsePlugin/build_directory/features/com.intel.sgx.feature/feature.xml

@@ -12,21 +12,21 @@
 <!--                                                                       -->
 <feature
       id="com.intel.sgx.feature"
-      label="Software Guard Extensions Plugin"
+      label="Intel(R) Software Guard Extensions Plugin"
       version="1.0.1.qualifier"
       provider-name="INTEL">
 
    <description url="http://fso-dev-machine.ed.intel.com">
-      The Software Guard Extensions Plug-in enables Independent Service
+      The Intel(R) Software Guard Extensions Plug-in enables Independent Service
 Vendors in developing Linux applications
-with Software Guard Extensions. The Plug-in extends the C/C++ Development
+with Intel(R) Software Guard Extensions. The Plug-in extends the C/C++ Development
 tools Plug-in to allow ISVs develop secure extensions in C or
 C++. The Plug-in also allows conversion of an Linux Application
 project into an Linux Application project with Software Guard
 Extensions.
 Using the Plug-in features and Intel(R) SGX Plug-in Menu options, a developer
 can modify the Signing keys and Enclave Configuration for an
-Enclave project and can add enclaves inside a project with SGX Nature.
+Enclave project and can add enclaves inside a project with Intel(R) SGX Nature.
 Once development is complete, the developer can build the Enclave
 and the Linux project using the Intel(R) SGX SDK for Linux with Release/Debug Configurations in Simulation/Hardware
 mode and Hardware Prerelease mode.
@@ -110,7 +110,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
    </license>
 
    <url>
-      <update label="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="http://fso-dev-machine.rd.intel.com/sgx"/>
    </url>
 
    <requires>

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 License:  Eclipse Public License Version 1.0 ("EPL")
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SGX Eclipse Plugin Userguide
+Bundle-Name: Intel(R) SGX Eclipse Plugin Userguide
 Bundle-SymbolicName: com.intel.sgx.userguide;singleton:=true
 Bundle-Version: 1.0.1.qualifier
 Bundle-Activator: com.intel.sgx.userguide.Activator

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx.userguide/toc.xml

@@ -24,22 +24,22 @@
     <topic label='Configuring Intel(R) SGX Plug-in' href='html/content.html#Configuring_Intel_Software_Guard_Extensions_Eclipse_Plug-in' />
   </topic>
   <topic label='Command Reference' href='html/content.html#Command_Reference'>
-    <topic label='Adding SGX Nature to a Project' href='html/content.html#Adding_SGX_Nature_to_a_Project'>
-      <topic label='Adding SGX Nature to a non-SGX project' href='html/content.html#Adding_SGX_Nature_to_a_non_SGX_project' />
-      <topic label='Creating a New C/C++ Project with SGX Nature' href='html/content.html#Creating_a_New_C_C_Project_with_SGX_Nature' />
+    <topic label='Adding Intel(R) SGX Nature to a Project' href='html/content.html#Adding_SGX_Nature_to_a_Project'>
+      <topic label='Adding Intel(R) SGX Nature to a non-SGX project' href='html/content.html#Adding_SGX_Nature_to_a_non_SGX_project' />
+      <topic label='Creating a New C/C++ Project with Intel(R) SGX Nature' href='html/content.html#Creating_a_New_C_C_Project_with_SGX_Nature' />
     </topic>
-    <topic label='Adding an SGX Enclave' href='html/content.html#Adding_an_SGX_Enclave' />
-    <topic label='Adding an SGX Trusted Library' href='html/content.html#Adding_an_SGX_Trusted_Library' />
-    <topic label='Adding an SGX Untrusted Module' href='html/content.html#Adding_an_SGX_Untrusted_Module' />
-    <topic label='Updating SGX Enclave Signing Key' href='html/content.html#Updating_SGX_Enclave_Signing_Key' />
+    <topic label='Adding an Intel(R) SGX Enclave' href='html/content.html#Adding_an_SGX_Enclave' />
+    <topic label='Adding an Intel(R) SGX Trusted Library' href='html/content.html#Adding_an_SGX_Trusted_Library' />
+    <topic label='Adding an Intel(R) SGX Untrusted Module' href='html/content.html#Adding_an_SGX_Untrusted_Module' />
+    <topic label='Updating Intel(R) SGX Enclave Signing Key' href='html/content.html#Updating_SGX_Enclave_Signing_Key' />
     <topic label='Updating Enclave Configuration Files' href='html/content.html#Updating_Enclave_Configuration_Files' />
     <topic label='Two Steps Sign Enclave' href='html/content.html#Two_Steps_Sign_Enclave'>
       <topic label='Generate Hash' href='html/content.html#Generate_Hash' />
       <topic label='Generate Signed Enclaves' href='html/content.html#Generate_Signed_Enclaves' />
     </topic>
   </topic>
-  <topic label='Building and Running SGX Code' href='html/content.html#Building_and_Running_SGX_Code'>
-    <topic label='SGX Build Configurations' href='html/content.html#SGX_Build_Configurations' />
+  <topic label='Building and Running Intel(R) SGX Code' href='html/content.html#Building_and_Running_SGX_Code'>
+    <topic label='Intel(R) SGX Build Configurations' href='html/content.html#SGX_Build_Configurations' />
     <topic label='Running Samples Generated for Enclaves' href='html/content.html#Running_Samples_Generated_for_Enclaves' />
   </topic>
 </toc>

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/plugin.xml

@@ -12,20 +12,20 @@
 <!--                                                                       -->
 <?eclipse version="3.4"?>
 <plugin>
-  <extension id="com.intel.sgx.sgxbuilderdefinitions" name="Software Guard Extensions Builder Definition"
+  <extension id="com.intel.sgx.sgxbuilderdefinitions" name="Intel(R) Software Guard Extensions Builder Definition"
 	     point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
     <toolChain configurationEnvironmentSupplier="com.linux.ide.eclipse.ndk.internal.build.NdkEnvSupplier"
-	       id="com.intel.sgx.SGXtoolChain" isAbstract="false" name="SGX GCC"
+	       id="com.intel.sgx.SGXtoolChain" isAbstract="false" name="Intel(R) SGX"
 	       supportsManagedBuild="false">
       <builder cleanBuildTarget="clean" command="make"
 	       commandLauncher="com.intel.sgx.build.SGXSDKCommandLauncher" id="com.intel.sgx.sgxbuilder"
 	       isAbstract="false" isVariableCaseSensitive="false"
-	       name="Software Guard Extensions Linux Builder">
+	       name="Intel(R) Software Guard Extensions Linux Builder">
       </builder>
       <targetPlatform binaryParser="org.eclipse.cdt.core.ELF"
 		      id="com.intel.sgx.targetEnclave" isAbstract="false">
       </targetPlatform>
-      <tool id="com.intel.sgx.compiler" isAbstract="false" name="SGX GCC Compiler"
+      <tool id="com.intel.sgx.compiler" isAbstract="false" name="Intel(R) SGX"
 	    natureFilter="both">
 	<option browseType="directory" id="com.intel.sgx.option.includePath"
 		isAbstract="false" resourceFilter="all" valueType="includePath">
@@ -39,97 +39,97 @@
 
 
 
-    <configuration id="com.intel.sgx.configuration.Sim.Debug" name="SGX Simulation Debug">
+    <configuration id="com.intel.sgx.configuration.Sim.Debug" name="Intel(R) SGX Simulation Debug">
          <toolChain id="com.intel.sgx.toolChain.Sim.Debug" isAbstract="false"
-		     name="SGX GCC" superClass="com.intel.sgx.SGXtoolChain">
+		     name="Intel(R) SGX" superClass="com.intel.sgx.SGXtoolChain">
              <builder arguments="SGX_DEBUG=1 SGX_MODE=SIM -f sgx/Makefile" command="make"
 		         id="com.intel.sgx.builder2" isAbstract="false"
-        		 isVariableCaseSensitive="false" name="Software Guard Extensions Linux Builder"
+        		 isVariableCaseSensitive="false" name="Intel(R) Software Guard Extensions Linux Builder"
 		         superClass="com.intel.sgx.sgxbuilder">
         	</builder>
           </toolChain>
     </configuration>
 
-    <configuration id="com.intel.sgx.configuration.HW.Debug" name="SGX Hardware Debug">
+    <configuration id="com.intel.sgx.configuration.HW.Debug" name="Intel(R) SGX Hardware Debug">
          <toolChain id="com.intel.sgx.toolChain.HW.Debug" isAbstract="false"
-		     name="SGX GCC" superClass="com.intel.sgx.SGXtoolChain">
+		     name="Intel(R) SGX" superClass="com.intel.sgx.SGXtoolChain">
         	<builder arguments="SGX_DEBUG=1 SGX_MODE=HW -f sgx/Makefile" command="make"
 	        	 id="com.intel.sgx.builder1" isAbstract="false"
-		         isVariableCaseSensitive="false" name="Software Guard Extensions Linux Builder"
+		         isVariableCaseSensitive="false" name="Intel(R) Software Guard Extensions Linux Builder"
         		 superClass="com.intel.sgx.sgxbuilder">
 	        </builder>
          </toolChain>
     </configuration>
 
-   <configuration id="com.intel.sgx.configuration.Sim.Release" name="SGX Simulation">
+   <configuration id="com.intel.sgx.configuration.Sim.Release" name="Intel(R) SGX Simulation">
         <toolChain id="com.intel.sgx.toolChain.Sim.Release" isAbstract="false"
-   	     name="SGX GCC" superClass="com.intel.sgx.SGXtoolChain">
+   	     name="Intel(R) SGX" superClass="com.intel.sgx.SGXtoolChain">
             <builder arguments="SGX_DEBUG=0 SGX_MODE=SIM -f sgx/Makefile" command="make"
    	         id="com.intel.sgx.builder3" isAbstract="false"
-       		 isVariableCaseSensitive="false" name="Software Guard Extensions Linux Builder"
+       		 isVariableCaseSensitive="false" name="Intel(R) Software Guard Extensions Linux Builder"
    	         superClass="com.intel.sgx.sgxbuilder">
        	</builder>
          </toolChain>
    </configuration>
                                                                                                
-   <configuration id="com.intel.sgx.configuration.HW.Prerelease" name="SGX Hardware Prerelease">
+   <configuration id="com.intel.sgx.configuration.HW.Prerelease" name="Intel(R) SGX Hardware Prerelease">
         <toolChain id="com.intel.sgx.toolChain.HW.Prerelease" isAbstract="false"
-   	     name="SGX GCC" superClass="com.intel.sgx.SGXtoolChain">
+   	     name="Intel(R) SGX" superClass="com.intel.sgx.SGXtoolChain">
        	<builder arguments="SGX_PRERELEASE=1 SGX_MODE=HW -f sgx/Makefile" command="make"
            	 id="com.intel.sgx.builder5" isAbstract="false"
-   	         isVariableCaseSensitive="false" name="Software Guard Extensions Linux Builder"
+   	         isVariableCaseSensitive="false" name="Intel(R) Software Guard Extensions Linux Builder"
        		 superClass="com.intel.sgx.sgxbuilder">
            </builder>
         </toolChain>
    </configuration>
 
-   <configuration id="com.intel.sgx.configuration.HW.Release" name="SGX Hardware Release">
+   <configuration id="com.intel.sgx.configuration.HW.Release" name="Intel(R) SGX Hardware Release">
         <toolChain id="com.intel.sgx.toolChain.HW.Release" isAbstract="false"
-   	     name="SGX GCC" superClass="com.intel.sgx.SGXtoolChain">
+   	     name="Intel(R) SGX" superClass="com.intel.sgx.SGXtoolChain">
        	<builder arguments="SGX_DEBUG=0 SGX_MODE=HW -f sgx/Makefile" command="make"
            	 id="com.intel.sgx.builder6" isAbstract="false"
-   	         isVariableCaseSensitive="false" name="Software Guard Extensions Linux Builder"
+   	         isVariableCaseSensitive="false" name="Intel(R) Software Guard Extensions Linux Builder"
        		 superClass="com.intel.sgx.sgxbuilder">
            </builder>
         </toolChain>
    </configuration>
 
 </extension>
-<extension id="com.intel.sgx.SGXPerProjectProfile" name="SGX Per Project Profile"
+<extension id="com.intel.sgx.SGXPerProjectProfile" name="Intel(R) SGX Per Project Profile"
 	   point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
   <scannerInfoCollector
       class="com.intel.sgx.discovery.SGXSDKScannerInfoCollector" scope="project">
   </scannerInfoCollector>
 </extension>
-<extension id="com.intel.sgx.commands" name="SGX Commands"
+<extension id="com.intel.sgx.commands" name="Intel(R) SGX Commands"
 	   point="org.eclipse.ui.commands">
-  <category id="com.intel.sgx.category.enclaveIF" name="SGX Untrusted Enclave Interface">
+  <category id="com.intel.sgx.category.enclaveIF" name="Intel(R) SGX Untrusted Enclave Interface">
   </category>
-  <category id="com.intel.sgx.category.trustedIF" name="SGX Trusted Enclave Interface">
+  <category id="com.intel.sgx.category.trustedIF" name="Intel(R) SGX Trusted Enclave Interface">
   </category>
   <command categoryId="com.intel.sgx.category.enclaveIF" id="com.intel.sgx.command.addEnclave"
-	   name="Add SGX Enclave">
+	   name="Add Intel(R) SGX Enclave">
     <commandParameter id="com.intel.sgx.commandParameter3"
 		      name="name" optional="true">
     </commandParameter>
   </command>
   <command categoryId="com.intel.sgx.category.enclaveIF" id="com.intel.sgx.command.addTrustedStaticLib"
-	   name="Add SGX Trusted Static Library">
+	   name="Add Intel(R) SGX Trusted Static Library">
     <commandParameter id="com.intel.sgx.commandParameter3"
 		      name="name" optional="true">
     </commandParameter>
   </command>
   <command categoryId="com.intel.sgx.category.enclaveIF" id="com.intel.sgx.command.removeEnclave"
-	   name="Remove SGX Enclave">
+	   name="Remove Intel(R) SGX Enclave">
   </command>
   <command categoryId="com.intel.sgx.category.enclaveIF" id="com.intel.sgx.command.addUntrustedModule"
-	   name="Add SGX Untrusted Module">
+	   name="Add Intel(R) SGX Untrusted Module">
   </command>
   <command categoryId="com.intel.sgx.category.enclaveIF" id="com.intel.sgx.command.addSGXNature"
-	   name="Add SGX Nature">
+	   name="Add Intel(R) SGX Nature">
   </command>
   <command categoryId="com.intel.sgx.category.enclaveIF" id="com.intel.sgx.command.updateSigningKey"
-	   name="Update SGX Enclave Signing Key">
+	   name="Update Intel(R) SGX Enclave Signing Key">
   </command>
   <command categoryId="com.intel.sgx.category.enclaveIF"
 	   id="com.intel.sgx.command.enclaveConfigHandler" name="Update Config">
@@ -144,7 +144,7 @@
 <extension point="org.eclipse.ui.menus">
   <menuContribution allPopups="false"
 		    locationURI="popup:org.eclipse.ui.popup.any?after=additions">
-    <menu label="Software Guard Extension Tools">
+    <menu label="Intel(R) Software Guard Extensions Tools">
       	<visibleWhen checkEnabled="false">
 	  <with variable="selection">
 	    <test property="com.intel.sgx.testers.sgxNatureAdded"
@@ -281,7 +281,7 @@
       </menu>
 
     </menu>
-    <menu label="Software Guard Extension Options">
+    <menu label="Intel(R) Software Guard Extensions Options">
       <visibleWhen checkEnabled="false">
 	<with variable="selection">
 	  <iterate ifEmpty="false" operator="or">
@@ -367,7 +367,7 @@
 </extension>
 <extension point="org.eclipse.ui.preferencePages">
   <page class="com.intel.sgx.preferences.SGXPreferencePage" id="com.intel.sgx.preferences.SGXPreferencePage"
-	name="SGX Preferences">
+	name="Intel(R) SGX Preferences">
   </page>
 </extension>
 <extension point="org.eclipse.core.runtime.preferences">
@@ -677,7 +677,7 @@
 
 
   <template id="com.intel.sgx.AddSGXNature" location="templates/SGXtemplates/common/addnaturetemplate.xml"
-	    projectType="Software Guard Extensions Project">
+	    projectType="Intel(R) Software Guard Extensions Project">
   </template>
 
   <template id="com.intel.sgx.SGXEnclaveConfig" location="templates/SGXtemplates/configtemplate.xml"
@@ -715,19 +715,19 @@
 	    natures="org.eclipse.cdt.core.cnature">
   </provider>
 </extension>
-<extension id="sgxnature" name="SGX Nature"
+<extension id="sgxnature" name="Intel(R) SGX Nature"
 	   point="org.eclipse.core.resources.natures">
   <runtime>
     <run class="com.intel.sgx.natures.SGXNature" />
   </runtime>
 </extension>
-<extension id="sgxccnature" name="SGX CCNature"
+<extension id="sgxccnature" name="Intel(R) SGX CCNature"
 	   point="org.eclipse.core.resources.natures">
   <runtime>
     <run class="com.intel.sgx.natures.SGXCCNature" />
   </runtime>
 </extension>
-<extension id="sgxstaticccnature" name="SGX StaticCCNature"
+<extension id="sgxstaticccnature" name="Intel(R) SGX StaticCCNature"
 	   point="org.eclipse.core.resources.natures">
   <runtime>
     <run class="com.intel.sgx.natures.SGXStaticCCNature" />
@@ -748,7 +748,7 @@
   <category
       id = "com.intel.sgx.wizzards"
 
-name="C/C++ projects with SGX Enabled">
+name="C/C++ projects with Intel(R) SGX Enabled">
   </category>
 
   <wizard
@@ -762,7 +762,7 @@ name="C/C++ projects with SGX Enabled">
       name="C Project"
       project="true">
     <description>
-      An C project, with SGX Commands and Configurations
+      An C project, with Intel(R) SGX Commands and Configurations
     </description>
   </wizard>
 
@@ -777,7 +777,7 @@ name="C/C++ projects with SGX Enabled">
       name="C++ Project"
       project="true">
     <description>
-      An C++ project, with SGX Commands and Configurations
+      An C++ project, with Intel(R) SGX Commands and Configurations
     </description>
   </wizard>
   

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

@@ -95,7 +95,7 @@ public class AddEnclaveFileDialog extends SGXDialogBase {
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText("Add New SGX Enclave Dialog");
+		newShell.setText("Add New Intel(R) SGX Enclave Dialog");
 		newShell.layout();
 	}
 	

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

@@ -79,7 +79,7 @@ public class AddTrustedStaticLibFileDialog extends SGXDialogBase  {
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText("Add New SGX Static Trusted Library Dialog");
+		newShell.setText("Add New Intel(R) SGX Static Trusted Library Dialog");
 	}
 
 	@Override

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

@@ -112,7 +112,7 @@ public class AddUntrustedModuleDialog extends Dialog {
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText("Add SGX Untrusted Module.");
+		newShell.setText("Add Intel(R) SGX Untrusted Module.");
 	}
 	
 	@Override

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

@@ -82,7 +82,7 @@ public abstract class TwoStepSignHandlerBase extends SGXHandler {
 	void initializeSigntool() throws ErrorException {
 		signtool = PreferenceConstants.getSDKDescriptor().getSignerPath();
 		if (!signtool.exists() || signtool.isDirectory()) {
-			quitWithError("Error generating hash! Sign Tool Not Found !\n Please make sure to have written in the box the value for  SGX SDK Directory in Window->Preferences->SGX Preferences. \n Usually the path is in /opt/intel/sgxsdk/" );
+			quitWithError("Error generating hash! Sign Tool Not Found !\n Please make sure to have written in the box the value for  Intel(R) SGX SDK Directory in Window->Preferences->Intel(R) SGX Preferences. \n Usually the path is in /opt/intel/sgxsdk/" );
 		}
 
 	}

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

@@ -65,7 +65,7 @@ public class UpdateSigningKey extends SGXHandler {
 			IPath destFile = Path.fromOSString(destinationKeyFile);
 			copyFile(sourceFile.toFile(), destFile.toFile());
 			refreshProject();
-			info("Update SGX Enclave Signing Key","copied \n'" + sourceKeyFile + "' into \n'" + destFile + "'");
+			info("Update Intel(R) SGX Enclave Signing Key","copied \n'" + sourceKeyFile + "' into \n'" + destFile + "'");
 		} else {
 			UpdateSignKeyDialog.regenerate = false;
 			try {
@@ -84,7 +84,7 @@ public class UpdateSigningKey extends SGXHandler {
 				}
 				project.refreshLocal(IResource.DEPTH_INFINITE, null);
 				if (q.exitValue() == 0){
-					info("Update SGX Enclave Signing Key","'"+destinationKeyFile+"'"+" was generated!");
+					info("Update Intel(R) SGX Enclave Signing Key","'"+destinationKeyFile+"'"+" was generated!");
 				} else {
 					quitWithError("Could not generate '"+destinationKeyFile+"'!!!");
 				}

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

@@ -46,7 +46,7 @@ public class SGXPreferencePage
 	public SGXPreferencePage() {
 		super(GRID);
 		setPreferenceStore(Activator.getDefault().getPreferenceStore());
-		setDescription("SGX Preferences");
+		setDescription("Intel(R) SGX Preferences");
 	}
 	
 	/**
@@ -59,12 +59,12 @@ public class SGXPreferencePage
 	@Override
     protected void createFieldEditors() {
         sgxSdkDirectoryEditor = new SGXSdkDirectoryFieldEditor(PreferenceConstants.SDK_PATH,
-        		"&SGX SDK Directory:", getFieldEditorParent());
+        		"&Intel(R) SGX SDK Directory:", getFieldEditorParent());
         addField(sgxSdkDirectoryEditor);
     }
 
 	/*
-	 * Validates whether the path entered in the SGX SDK Preferences points to the SGX SDK or not.
+	 * Validates whether the path entered in the Intel(R) SGX SDK Preferences points to the Intel(R) SGX SDK or not.
 	 */
     private static class SGXSdkDirectoryFieldEditor extends DirectoryFieldEditor {
         public SGXSdkDirectoryFieldEditor(String name, String labelText, Composite parent) {
@@ -75,13 +75,13 @@ public class SGXPreferencePage
         @Override
         protected boolean doCheckState() {
             if (!super.doCheckState()) {
-                setErrorMessage("SGX Preferences: Not a Valid directory");
+                setErrorMessage("Intel(R) SGX Preferences: Not a Valid directory");
                 return false;
             }
 
             String dirname = getTextControl().getText().trim();
             if (!dirname.isEmpty() && !SdkPathVariableProvider.isValidSGXSdkLocation(dirname)) {
-                setErrorMessage("SGX SDK: Not a Valid SGX SDK directory");
+                setErrorMessage("Intel(R) SGX SDK: Not a Valid SGX SDK directory");
                 return false;
             }
             return true;

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

@@ -12,34 +12,34 @@
     SGX.author=Intel
     
     #Add Nature template Values
-    SGX.naturetemplate.title.description=A Software Guard Extensions Project template.
-    SGX.naturetemplate.title.label=SGX Project
+    SGX.naturetemplate.title.description=A Intel Software Guard Extensions Project template.
+    SGX.naturetemplate.title.label=Intel SGX Project
     SGX.naturetemplate.title.id=AddSGXNature
     
     #Enclave Config template Values
-    SGX.enclaveconfig.template.title.description=A Software Guard Extensions Configuration template.
-    SGX.enclaveconfig.template.title.label=SGX Enclave Configuration
+    SGX.enclaveconfig.template.title.description=A Intel Software Guard Extensions Configuration template.
+    SGX.enclaveconfig.template.title.label=Intel SGX Enclave Configuration
     SGX.enclaveconfig.template.title.id=SGXEnclaveConfig
     
     #Untrusted Module template values
-    SGX.untrustedModule.template.title.description= A Software Guard Extensions Untrusted Module template.
-    SGX.untrustedModule.template.title.label=SGX Untrusted Module
+    SGX.untrustedModule.template.title.description= A Intel Software Guard Extensions Untrusted Module template.
+    SGX.untrustedModule.template.title.label=Intel SGX Untrusted Module
     
     #Enclave template values
-    SGX.enclave.template.title.description= A Software Guard Extensions Project template.
-    SGX.enclave.template.title.label=SGX Project
+    SGX.enclave.template.title.description= A Intel Software Guard Extensions Project template.
+    SGX.enclave.template.title.label=Intel SGX Project
     SGX.enclave.template.title.id=SGXProject
 	
 	#C template Values
-    SGX.Ctemplate.title.description=A Software Guard Extensions C Enclave Project template.
-    SGX.Ctemplate.title.label=SGX C Enclave Project
+    SGX.Ctemplate.title.description=A Intel Software Guard Extensions C Enclave Project template.
+    SGX.Ctemplate.title.label=Intel SGX C Enclave Project
     SGX.Ctemplate.title.id=SGXCProject
     SGX.Ctemplate.enclaveSettings.label=Enclave Settings
     SGX.Ctemplate.enclaveSettings.description=Initial settings required for a new enclave.
     
     #C Static lib template Values
-    SGX.CStatictemplate.title.description=A Software Guard Extensions C Enclave Project template.
-    SGX.CStatictemplate.title.label=SGX C Enclave Library Project
+    SGX.CStatictemplate.title.description=A Intel Software Guard Extensions C Enclave Project template.
+    SGX.CStatictemplate.title.label=Intel SGX C Enclave Library Project
     SGX.CStatictemplate.title.id=SGXCEnclaveLibProject
     SGX.CStatictemplate.enclaveSettings.label=Enclave Settings
     SGX.CStatictemplate.enclaveSettings.description=Initial settings required for a new enclave Library.
@@ -47,15 +47,15 @@
     SGX.CStatictemplate.requiresEdl.description=De-select this option to create an Non-SGX trusted static library without an Edl file. By default, the project creates an Enclave library with an Edl file.
     
     #CXX template Values
-    SGX.CXXtemplate.title.description=A Software Guard Extensions C++ Enclave Project template.
-    SGX.CXXtemplate.title.label=C/C++ Project with SGX Nature
+    SGX.CXXtemplate.title.description=A Intel Software Guard Extensions C++ Enclave Project template.
+    SGX.CXXtemplate.title.label=C/C++ Project with Intel SGX Nature
     SGX.CXXtemplate.title.id=SGXCPPProject
     SGX.CXXtemplate.enclaveSettings.label=Enclave Settings
     SGX.CXXtemplate.enclaveSettings.description=Initial settings required for a new enclave.
     
     #CXX Static lib template Values
-    SGX.CXXStatictemplate.title.description=A Software Guard Extensions C++ Enclave Library Project template.
-    SGX.CXXStatictemplate.title.label=SGX C++ Enclave Library Project
+    SGX.CXXStatictemplate.title.description=A Intel Software Guard Extensions C++ Enclave Library Project template.
+    SGX.CXXStatictemplate.title.label=Intel SGX C++ Enclave Library Project
     SGX.CXXStatictemplate.title.id=SGXCPPEnclaveLibProject
     SGX.CXXStatictemplate.enclaveSettings.label=Enclave Settings
     SGX.CXXStatictemplate.enclaveSettings.description=Initial settings required for a new enclave Library.

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXEnclave/makefiles/c++/sgx_t.mk

@@ -1,4 +1,4 @@
-######## SGX SDK Settings ########
+######## Intel(R) SGX SDK Settings ########
 SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXEnclave/makefiles/c++/sgx_u.mk

@@ -1,4 +1,4 @@
-######## SGX SDK Settings ########
+######## Intel(R) SGX SDK Settings ########
 SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXEnclave/makefiles/c++/sgx_u.without_app.mk

@@ -1,4 +1,4 @@
-######## SGX SDK Settings ########
+######## Intel(R) SGX SDK Settings ########
 SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXEnclave/makefiles/c/sgx_t.mk

@@ -1,4 +1,4 @@
-######## SGX SDK Settings ########
+######## Intel(R) SGX SDK Settings ########
 SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXEnclave/makefiles/c/sgx_u.mk

@@ -1,4 +1,4 @@
-######## SGX SDK Settings ########
+######## Intel(R) SGX SDK Settings ########
 SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXEnclave/makefiles/c/sgx_u.without_app.mk

@@ -1,4 +1,4 @@
-######## SGX SDK Settings ########
+######## Intel(R) SGX SDK Settings ########
 SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64

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

@@ -69,8 +69,8 @@ static sgx_errlist_t sgx_errlist[] = {
     },
     {
         SGX_ERROR_NO_DEVICE,
-        "Invalid SGX device.",
-        "Please make sure SGX module is enabled in the BIOS, and install SGX driver afterwards."
+        "Invalid Intel(R) SGX device.",
+        "Please make sure Intel(R) SGX module is enabled in the BIOS, and install Intel(R) SGX driver afterwards."
     },
     {
         SGX_ERROR_MEMORY_MAP_CONFLICT,
@@ -84,7 +84,7 @@ static sgx_errlist_t sgx_errlist[] = {
     },
     {
         SGX_ERROR_DEVICE_BUSY,
-        "SGX device was busy.",
+        "Intel(R) SGX device was busy.",
         NULL
     },
     {

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXTrustedStaticLibrary/makefiles/c++/sgx_t_static.mk

@@ -1,4 +1,4 @@
-######## SGX SDK Settings ########
+######## Intel(R) SGX SDK Settings ########
 SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXTrustedStaticLibrary/makefiles/c++/sgx_u.without_app.mk

@@ -1,4 +1,4 @@
-######## SGX SDK Settings ########
+######## Intel(R) SGX SDK Settings ########
 SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXTrustedStaticLibrary/makefiles/c/sgx_t_static.mk

@@ -1,4 +1,4 @@
-######## SGX SDK Settings ########
+######## Intel(R) SGX SDK Settings ########
 SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXTrustedStaticLibrary/makefiles/c/sgx_u.without_app.mk

@@ -1,4 +1,4 @@
-######## SGX SDK Settings ########
+######## Intel(R) SGX SDK Settings ########
 SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXUntrustedModule/makefiles/c++/sgx_u.without_app.mk

@@ -1,4 +1,4 @@
-######## SGX SDK Settings ########
+######## Intel(R) SGX SDK Settings ########
 SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXUntrustedModule/makefiles/c/sgx_u.without_app.mk

@@ -1,4 +1,4 @@
-######## SGX SDK Settings ########
+######## Intel(R) SGX SDK Settings ########
 SGX_SDK ?=  $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64

Linux_SGXEclipsePlugin/build_directory/sites/site.xml

@@ -11,7 +11,7 @@
 <!--     Intel Corporation - initial implementation and documentation	   -->
 <!--                                                                       -->
 <site>
-   <description name="Software Guard Extensions Plug-in" url="http://fso-dev-machine.rd.intel.com/sgx">
+   <description name="Intel(R) Software Guard Extensions Plug-in" url="http://fso-dev-machine.rd.intel.com/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">

common/inc/internal/se_version.h

@@ -28,5 +28,5 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-#define STRFILEVER      "1.8.100.37689"
+#define STRFILEVER      "1.8.100.37739"