[tomcat-native] branch main updated: Align default pass phrase prompt with HTTPd

[michaelo]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


The following commit(s) were added to refs/heads/main by this push:
     new cea4e7e87 Align default pass phrase prompt with HTTPd
cea4e7e87 is described below

commit cea4e7e87749613ae639a9236d0e531d190ee8d7
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Mon Jun 26 18:05:40 2023 +0200

    Align default pass phrase prompt with HTTPd
---
 native/include/ssl_private.h      | 6 +++---
 xdocs/miscellaneous/changelog.xml | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index be2397053..242ab4dd4 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -171,9 +171,9 @@ extern ENGINE *tcn_ssl_engine;
     || (errnum == X509_V_ERR_CERT_UNTRUSTED) \
     || (errnum == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE))
 
-#define SSL_DEFAULT_PASS_PROMPT "Some of your private key files are encrypted 
for security reasons.\n"  \
-                                "In order to read them you have to provide the 
pass phrases.\n"         \
-                                "Enter password :"
+#define SSL_DEFAULT_PASS_PROMPT "Some of your private key files are encrypted 
for security reasons.\n" \
+                                "In order to read them you have to provide the 
pass phrases.\n"        \
+                                "Enter pass phrase:"
 
 #define SSL_CIPHERS_ALWAYS_DISABLED         ("!aNULL:!eNULL:!EXP:")
 
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 918615532..76d06de91 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -33,6 +33,9 @@
 </section>
 <section name="Changes in 2.0.5">
   <changelog>
+    <update>
+      Align default pass phrase prompt with HTTPd. (michaelo)
+    </update>
     <update>
       Rename configure.in to modern autotools style configure.ac. (rjung)
     </update>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org