Update gpcp.xml

Updates from the meeting on 8/7. Removed some highlighted texts and closed some issues. Also fixed a typo and reworded the SSH-based authentication.

Author: zjbdragon

input/gpcp.xml

@@ -988,9 +988,9 @@
 			<consistency-rationale/>
 			<f-element id="fau-stg-1e1">
 				<title>The TSF shall be able to<selectables>
-					<selectable><h:mark>store audit data on the TOE itself</h:mark></selectable>
-					<selectable><h:mark>transmit audit data to an external IT entity using a trusted 
-						channel in accordance with FTP_ITC_EXT.1</h:mark></selectable>
+					<selectable>store audit data on the TOE itself</selectable>
+					<selectable>transmit audit data to an external IT entity using a trusted 
+						channel in accordance with FTP_ITC_EXT.1</selectable>
 					<selectable id="sel-fau-stg-1e1-removable">write audit data to removable media
 						under administratie control in accordance with FIA_UIA_EXT.</selectable></selectables>  
 				</title>
@@ -1000,7 +1000,7 @@
 					channel must be selected in FTP_ITC_EXT.1. <h:p/>
 					The ST Author selects "<h:i>removable media</h:i>" if the TOE supports offload of audit data using 
 					removable media such as thumb drives or disks. Note that the CSfC Use Case prohibits the
-					use of removable media.<h:mark>(Issue 71)</h:mark>
+					use of removable media.
 				</note>
 				<aactivity level="element">
 					<TSS>
@@ -6607,7 +6607,7 @@
 				<note role="application">
 					<h:mark>The purpose of this requirement is to prevent hammering attacks from avoiding triggering the
 					actions in FIA_AFL_EXT.1.5 by rebooting the system in order to zero the authentication 
-					failure count. This purpise is achieved by default if the minimum reboot time of the system 
+					failure count. This purpose is achieved by default if the minimum reboot time of the system 
 					is greater than the timeout penalty specified in FIA_AFL_EXT.1.5.<h:p/>
 					If the actions specified in FIA_AFL_EXT.1.5 are device wipe or a non-time-limited lockout, or if
 					the minimum reboot time is shorter than the specified lockout time, then  
@@ -6887,7 +6887,7 @@
 					The TSF shall provide [<h:i>password and 
 					<selectables>
 						<selectable id="sel-fia-uau-5-x509">X.509 certificate-based authentication</selectable>
-						<selectable id="sel-fia-uau-5-ssh">SSH-based authentication</selectable>
+						<selectable id="sel-fia-uau-5-ssh"><h:mark>SSH-based public key, password, or certificate authentication</h:mark></selectable>
 						<selectable>biometric authentication</selectable>
 						<selectable exclusive="yes">no other authentication mechanism</selectable>
 					</selectables></h:i>] to support user authentication.<h:mark>See Issue 67</h:mark>
@@ -7790,7 +7790,7 @@
 				</aactivity>
 			</f-element>
 			<audit-event type="optional">
-				<audit-event-descr>Detection of intrusion.<h:mark>Made this optional (Issue 51)</h:mark></audit-event-descr>
+				<audit-event-descr>Detection of intrusion.</audit-event-descr>
 				<audit-event-info>None.</audit-event-info>
 			</audit-event>
 		</f-component>
@@ -7854,7 +7854,7 @@
 			</aactivity>
 			</f-element>
 			<audit-event type="optional">
-				<audit-event-descr>Detection of intrusion.<h:mark>Made this optional (Issue 51)</h:mark></audit-event-descr>
+				<audit-event-descr>Detection of intrusion.</audit-event-descr>
 				<audit-event-info>None.</audit-event-info>
 			</audit-event>
 		</f-component>