Port update to SSL docs to include PKCS11 that users have successfully used.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@479059 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index eb59227..0d3a31e 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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">

diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml
index 304218d..b76d8ab 100644 (file)
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -175,8 +175,8 @@ hosts are commonly used with SSL in a production environment.</p>
 
 <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