Mercurial > hg > xemacs-beta
changeset 5888:a85efdabe237
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.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Thu, 09 Apr 2015 14:54:37 +0100 |
| parents | 6eca500211f4 |
| children | bd644055ef44 a0e751d6c3ad |
| files | src/ChangeLog src/tls.c |
| diffstat | 2 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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); }