aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2012-07-11 09:20:14 +0200
committerAndreas Schwab2012-07-11 09:20:14 +0200
commitd96a1e0c71d99aafcde25a700c310220c4e0c5de (patch)
treec3895e4a8861ba5df1f7acba3395f9b9be78fcd2 /src
parent34348bd4e5c89fa0e440e37efa20be2a00c8fd9c (diff)
downloademacs-d96a1e0c71d99aafcde25a700c310220c4e0c5de.tar.gz
emacs-d96a1e0c71d99aafcde25a700c310220c4e0c5de.zip
* gnutls.c (Fgnutls_boot): Properly parse :keylist argument.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/gnutls.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0ca6c0594a8..b323a876334 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12012-07-11 Andreas Schwab <schwab@linux-m68k.org> 12012-07-11 Andreas Schwab <schwab@linux-m68k.org>
2 2
3 * gnutls.c (Fgnutls_boot): Properly parse :keylist argument.
4
3 * coding.c (Fdefine_coding_system_internal): Use XCAR/XCDR instead 5 * coding.c (Fdefine_coding_system_internal): Use XCAR/XCDR instead
4 of Fcar/Fcdr if possible. 6 of Fcar/Fcdr if possible.
5 * font.c (check_otf_features): Likewise. 7 * font.c (check_otf_features): Likewise.
diff --git a/src/gnutls.c b/src/gnutls.c
index ad569e98226..9895936c246 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -916,7 +916,7 @@ one trustfile (usually a CA bundle). */)
916 for (tail = keylist; CONSP (tail); tail = XCDR (tail)) 916 for (tail = keylist; CONSP (tail); tail = XCDR (tail))
917 { 917 {
918 Lisp_Object keyfile = Fcar (XCAR (tail)); 918 Lisp_Object keyfile = Fcar (XCAR (tail));
919 Lisp_Object certfile = Fcar (XCDR (tail)); 919 Lisp_Object certfile = Fcar (Fcdr (XCAR (tail)));
920 if (STRINGP (keyfile) && STRINGP (certfile)) 920 if (STRINGP (keyfile) && STRINGP (certfile))
921 { 921 {
922 GNUTLS_LOG2 (1, max_log_level, "setting the client key file: ", 922 GNUTLS_LOG2 (1, max_log_level, "setting the client key file: ",