* gnutls.c (Fgnutls_boot): Properly parse :keylist argument.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0ca6c0594a88f80917b05ff676c8247c2ed61c15..b323a87633429eac9c121816bc5a9107b5a17f59 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-11  Andreas Schwab  <schwab@linux-m68k.org>
 
+       * gnutls.c (Fgnutls_boot): Properly parse :keylist argument.
+
        * coding.c (Fdefine_coding_system_internal): Use XCAR/XCDR instead
        of Fcar/Fcdr if possible.
        * font.c (check_otf_features): Likewise.

diff --git a/src/gnutls.c b/src/gnutls.c
index ad569e98226198829f927166012b85d80070ff21..9895936c246ac09bc869552c87666556bdad5928 100644 (file)
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -916,7 +916,7 @@ one trustfile (usually a CA bundle).  */)
       for (tail = keylist; CONSP (tail); tail = XCDR (tail))
        {
          Lisp_Object keyfile = Fcar (XCAR (tail));
-         Lisp_Object certfile = Fcar (XCDR (tail));
+         Lisp_Object certfile = Fcar (Fcdr (XCAR (tail)));
          if (STRINGP (keyfile) && STRINGP (certfile))
            {
              GNUTLS_LOG2 (1, max_log_level, "setting the client key file: ",