httpd-2.0.48-sslpphrase.patch

   1
   2 mod_ssl:
   3 - wording tweaks for pphrase prompting
   4 - upstream: workaround for UI_process dumping error stack during pphrase prompts
   5
   6 --- httpd-2.0.48/modules/ssl/ssl_engine_pphrase.c.sslpphrase
   7 +++ httpd-2.0.48/modules/ssl/ssl_engine_pphrase.c
   8 @@ -374,6 +374,8 @@
   9                  cpPassPhraseCur = NULL;
  10                  ssl_pphrase_server_rec = s; /* to make up for sslc flaw */
  11
  12 +                ERR_clear_error();
  13 +
  14                  bReadable = ((pPrivateKey = SSL_read_PrivateKey(szPath, NULL,
  15                              ssl_pphrase_Handle_CB, s)) != NULL ? TRUE : FALSE);
  16
  17 @@ -553,7 +555,7 @@
  18          sc = mySrvConfig(s);
  19          if (writetty) {
  20              apr_file_printf(writetty, "\n");
  21 -            apr_file_printf(writetty, "Ok: Pass Phrase Dialog successful.\n");
  22 +            apr_file_printf(writetty, "OK: Pass Phrase Dialog successful.\n");
  23          }
  24      }
  25
  26 @@ -747,7 +749,7 @@
  27              apr_file_printf(writetty, "%s mod_ssl/%s (Pass Phrase Dialog)\n",
  28                              AP_SERVER_BASEVERSION, MOD_SSL_VERSION);
  29              apr_file_printf(writetty, "Some of your private key files are encrypted for security reasons.\n");
  30 -            apr_file_printf(writetty, "In order to read them you have to provide us with the pass phrases.\n");
  31 +            apr_file_printf(writetty, "In order to read them you have to provide the pass phrases.\n");
  32          }
  33          if (*pbPassPhraseDialogOnce) {
  34              *pbPassPhraseDialogOnce = FALSE;