httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-test/perl-framework/t/conf/ssl ssl.conf.in
Date Thu, 28 Feb 2002 04:05:16 GMT
dougm       02/02/27 20:05:16

  Modified:    perl-framework/t/conf/ssl ssl.conf.in
  Log:
  add some IfDefines to assist in testing SSLPassPhraseDialog
  
  Revision  Changes    Path
  1.17      +18 -4     httpd-test/perl-framework/t/conf/ssl/ssl.conf.in
  
  Index: ssl.conf.in
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/conf/ssl/ssl.conf.in,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ssl.conf.in	29 Jan 2002 02:16:43 -0000	1.16
  +++ ssl.conf.in	28 Feb 2002 04:05:16 -0000	1.17
  @@ -5,8 +5,6 @@
       AddType application/x-x509-ca-cert .crt
       AddType application/x-pkcs7-crl    .crl
   
  -    SSLPassPhraseDialog  builtin
  -
       SSLSessionCache        none
       #XXX: would be nice to test these
       #SSLSessionCache        shm:@ServerRoot@/logs/ssl_scache(512000)
  @@ -32,9 +30,25 @@
   
       SSLCipherSuite ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
   
  -    SSLCertificateFile @SSLCA@/asf/certs/server.crt
  +    <IfDefine TEST_SSL_PASSPHRASE_EXEC>
  +        SSLPassPhraseDialog  exec:@ServerRoot@/conf/ssl/httpd-passphrase.pl
  +    </IfDefine>
  +    #else the default is builtin
  +    <IfDefine !TEST_SSL_PASSPHRASE_EXEC>
  +        SSLPassPhraseDialog  builtin
  +    </IfDefine>
  +
  +    <IfDefine TEST_SSL_DES3_KEY>
  +        SSLCertificateFile @SSLCA@/asf/certs/server_des3.crt
  +
  +        SSLCertificateKeyFile @SSLCA@/asf/keys/server_des3.pem
  +    </IfDefine>
  +    #else the default is an unencrypted key
  +    <IfDefine !TEST_SSL_DES3_KEY>
  +        SSLCertificateFile @SSLCA@/asf/certs/server.crt
   
  -    SSLCertificateKeyFile @SSLCA@/asf/keys/server.pem
  +        SSLCertificateKeyFile @SSLCA@/asf/keys/server.pem
  +    </IfDefine>
   
       #SSLCertificateChainFile @SSLCA@/asf/certs/cachain.crt
   
  
  
  

Mime
View raw message