# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1428587677 -3600
# Node ID a85efdabe23702f3b88f1c59ab668475ebad8da6
# Parent  6eca500211f4a9e851b8de8a9af3508c02b50b9d
Call #'read-passwd when requesting a password from the user, tls.c

src/ChangeLog addition:

2015-04-09  Aidan Kehoe  <kehoea@parhasard.net>

	* tls.c (nss_pk11_password):
	* tls.c (gnutls_pk11_password):
	* tls.c (openssl_password):
	* tls.c (syms_of_tls):
	Our read-a-password function is #'read-passwd, not
	#'read-password, correct that in this file.

diff -r 6eca500211f4 -r a85efdabe237 src/ChangeLog
--- a/src/ChangeLog	Thu Apr 09 14:27:02 2015 +0100
+++ b/src/ChangeLog	Thu Apr 09 14:54:37 2015 +0100
@@ -1,3 +1,12 @@
+2015-04-09  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* tls.c (nss_pk11_password):
+	* tls.c (gnutls_pk11_password):
+	* tls.c (openssl_password):
+	* tls.c (syms_of_tls):
+	Our read-a-password function is #'read-passwd, not
+	#'read-password, correct that in this file.
+
 2015-04-09  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* tls.c:
diff -r 6eca500211f4 -r a85efdabe237 src/tls.c
--- a/src/tls.c	Thu Apr 09 14:27:02 2015 +0100
+++ b/src/tls.c	Thu Apr 09 14:54:37 2015 +0100
@@ -29,7 +29,7 @@
 #include <netinet/tcp.h>
 
 static Lisp_Object prompt;
-static Lisp_Object Qread_password;
+static Lisp_Object Qread_passwd;
 Lisp_Object Qtls_error;
 
 #ifdef HAVE_NSS
@@ -313,7 +313,7 @@
   if (token_name == NULL)
     token_name = "security token";
   lsp_password =
-    call1 (Qread_password, concat2 (prompt,
+    call1 (Qread_passwd, concat2 (prompt,
 				    build_extstring (token_name, Qnative)));
   c_password = LISP_STRING_TO_EXTERNAL (lsp_password, Qnative);
   nss_password = PL_strdup (c_password);
@@ -718,7 +718,7 @@
   args[2] = build_ascstring (" (");
   args[3] = build_extstring (token_url, Qnative);
   args[4] = build_ascstring (")");
-  lsp_password = call1 (Qread_password, Fconcat (5, args));
+  lsp_password = call1 (Qread_passwd, Fconcat (5, args));
   c_password = LISP_STRING_TO_EXTERNAL (lsp_password, Qnative);
 
   /* Insert the password */
@@ -1079,7 +1079,7 @@
   Extbyte *c_password;
 
   lsp_password =
-    call1 (Qread_password, concat2 (prompt, build_ascstring ("PEM")));
+    call1 (Qread_passwd, concat2 (prompt, build_ascstring ("PEM: ")));
   c_password = LISP_STRING_TO_EXTERNAL (lsp_password, Qnative);
   strncpy (buf, c_password, size);
 
@@ -1172,7 +1172,7 @@
 syms_of_tls (void)
 {
 #ifdef WITH_TLS
-  DEFSYMBOL (Qread_password);
+  DEFSYMBOL (Qread_passwd);
 #endif
   DEFERROR (Qtls_error, "TLS error", Qerror);
 }