Author: markt Date: Fri Nov 24 16:29:25 2006 New Revision: 479059 URL: http://svn.apache.org/viewvc?view=rev&rev=479059 Log: Port update to SSL docs to include PKCS11 that users have successfully used.
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=479059&r1=479058&r2=479059 ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Nov 24 16:29:25 2006 @@ -70,7 +70,15 @@ MessageBytes.setString(null) will remove the String value. (remm) </fix> </changelog> - </subsection> + </subsection> + <subsection name="Webapps"> + <changelog> + <fix> + <bug>40677</bug>: Update SSL documentation to indicate that PKCS11 + keystores may be used. (markt) + </fix> + </changelog> + </subsection> </section> <section name="Tomcat 6.0.2 (remm)"> <subsection name="General"> Modified: tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml?view=diff&rev=479059&r1=479058&r2=479059 ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml Fri Nov 24 16:29:25 2006 @@ -175,8 +175,8 @@ <subsection name="Prepare the Certificate Keystore"> -<p>Tomcat currently operates only on <code>JKS</code> or <code>PKCS12</code> -format keystores. The <code>JKS</code> format +<p>Tomcat currently operates only on <code>JKS</code>, <code>PKCS11</code> or +<code>PKCS12</code> format keystores. The <code>JKS</code> format is Java's standard "Java KeyStore" format, and is the format created by the <code>keytool</code> command-line utility. This tool is included in the JDK. The <code>PKCS12</code> format is an internet standard, and can be manipulated --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]