httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_pphrase.c
Date Mon, 30 Jul 2001 22:34:21 GMT
wrowe       01/07/30 15:34:21

  Modified:    modules/ssl ssl_engine_pphrase.c
  Log:
    The short term hack.
  
  Revision  Changes    Path
  1.6       +9 -1      httpd-2.0/modules/ssl/ssl_engine_pphrase.c
  
  Index: ssl_engine_pphrase.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_pphrase.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ssl_engine_pphrase.c	2001/07/19 21:39:26	1.5
  +++ ssl_engine_pphrase.c	2001/07/30 22:34:21	1.6
  @@ -207,6 +207,14 @@
               if (sc->szPrivateKeyFile[j] != NULL)
                   apr_cpystrn(szPath, sc->szPrivateKeyFile[j++], sizeof(szPath));
   
  +            if (sc->szPrivateKeyFile[j] == NULL) {
  +                ssl_log(pServ, SSL_LOG_ERROR,
  +                        "Init: Server %s should be SSL-aware but "
  +                        "too few private key files were specified "
  +                        "[Hint: SSLCertificateKeyFile]", cpVHostID);
  +                ssl_die();
  +            }
  +
               /*
                * Try to read the private key file with the help of
                * the callback function which serves the pass
  @@ -228,7 +236,7 @@
               nPassPhraseDialogCur  = 0;
               bPassPhraseDialogOnce = TRUE;
   
  -			pPrivateKey = NULL;
  +            pPrivateKey = NULL;
   
               for (;;) {
                   /*
  
  
  

Mime
View raw message