ccain       01/09/24 11:30:05

  Modified:    catalina/src/conf Tag: tomcat_40_branch
                        server-noexamples.xml.config server.xml
               webapps/tomcat-docs Tag: tomcat_40_branch ssl-howto.xml
  Log:
  Commit the recent SSL doc changes from Patrick to the 4.0 final branch as
  well
  
  Submitted by: Patrick Luby <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +3 -1      
jakarta-tomcat-4.0/catalina/src/conf/server-noexamples.xml.config
  
  Index: server-noexamples.xml.config
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server-noexamples.xml.config,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- server-noexamples.xml.config      2001/08/10 14:14:15     1.2
  +++ server-noexamples.xml.config      2001/09/24 18:30:05     1.2.2.1
  @@ -37,7 +37,9 @@
              into "$JAVA_HOME/jre/lib/ext".
            * Edit "$JAVA_HOME/jre/lib/security/java.security" and add
                security.provider.2=com.sun.net.ssl.internal.ssl.Provider
  -         * Execute: keytool -genkey -alias tomcat -keyalg RSA
  +         * Execute:
  +             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
  +             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
              with a password value of "changeit".
   
            By default, DNS lookups are enabled when a web application calls
  
  
  
  1.29.2.1  +3 -1      jakarta-tomcat-4.0/catalina/src/conf/server.xml
  
  Index: server.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v
  retrieving revision 1.29
  retrieving revision 1.29.2.1
  diff -u -r1.29 -r1.29.2.1
  --- server.xml        2001/09/09 04:00:08     1.29
  +++ server.xml        2001/09/24 18:30:05     1.29.2.1
  @@ -37,7 +37,9 @@
              into "$JAVA_HOME/jre/lib/ext".
            * Edit "$JAVA_HOME/jre/lib/security/java.security" and add
                security.provider.2=com.sun.net.ssl.internal.ssl.Provider
  -         * Execute: keytool -genkey -alias tomcat -keyalg RSA
  +         * Execute:
  +             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
  +             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
              with a password value of "changeit".
   
            By default, DNS lookups are enabled when a web application calls
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +20 -3     jakarta-tomcat-4.0/webapps/tomcat-docs/ssl-howto.xml
  
  Index: ssl-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/ssl-howto.xml,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- ssl-howto.xml     2001/09/12 17:38:47     1.7
  +++ ssl-howto.xml     2001/09/24 18:30:05     1.7.2.1
  @@ -35,9 +35,15 @@
      set an environment variable <code>JSSE_HOME</code> that points at the
      directory into which you installed JSSE.</li><br/><br/>
   <li>Create a certificate keystore by executing the following command:
  +<p>Windows:</p>
   <source>
  -keytool -genkey -alias tomcat -keyalg RSA
  +%JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA
   </source>
  +<p>Unix:</p>
  +<source>
  +$JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA
  +</source>
  +<p></p>
       and specify a password value of "changeit".</li><br/><br/>
   <li>Uncomment the "SSL HTTP/1.1 Connector" entry in
       <code>$CATALINA_HOME/conf/server.xml</code> and tweak as necessary.</li>
  @@ -202,8 +208,13 @@
   
   <p>To create a new keystore from scratch, containing a single self-signed
   Certificate, execute the following from a terminal command line:</p>
  +<p>Windows:</p>
  +<source>
  +%JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA
  +</source>
  +<p>Unix:</p>
   <source>
  -keytool -genkey -alias tomcat -keyalg RSA
  +$JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA
   </source>
   
   <p>(The RSA algorithm should be preferred as a secure algorithm, and this
  @@ -216,8 +227,14 @@
   to the <code>keytool</code> command shown above.  You will also need to
   reflect this new location in the <code>server.xml</code> configuration file,
   as described later.  For example:</p>
  +<p>Windows:</p>
  +<source>
  +%JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA \
  +  -keystore \path\to\my\keystore
  +</source>
  +<p>Unix:</p>
   <source>
  -keytool -genkey -alias tomcat -keyalg RSA \
  +$JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA \
     -keystore /path/to/my/keystore
   </source>
   
  
  
  

Reply via email to