diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/gnutls.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a515080e85f..da8746c3ff8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-11-25 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Fix gnutls problems caught by static checking. | ||
| 4 | * gnutls.c (Fgnutls_boot): Remove unused local. | ||
| 5 | (Fgnutls_boot): Fix pointer signedness. | ||
| 6 | |||
| 1 | 2014-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org> | 7 | 2014-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 8 | ||
| 3 | * gnutls.c (gnutls_certificate_details): Don't include certain | 9 | * gnutls.c (gnutls_certificate_details): Don't include certain |
diff --git a/src/gnutls.c b/src/gnutls.c index 3c067418952..baadaaf29b2 100644 --- a/src/gnutls.c +++ b/src/gnutls.c | |||
| @@ -1185,7 +1185,6 @@ one trustfile (usually a CA bundle). */) | |||
| 1185 | Lisp_Object verify_error; | 1185 | Lisp_Object verify_error; |
| 1186 | Lisp_Object prime_bits; | 1186 | Lisp_Object prime_bits; |
| 1187 | Lisp_Object warnings; | 1187 | Lisp_Object warnings; |
| 1188 | Lisp_Object warning; | ||
| 1189 | 1188 | ||
| 1190 | CHECK_PROCESS (proc); | 1189 | CHECK_PROCESS (proc); |
| 1191 | CHECK_SYMBOL (type); | 1190 | CHECK_SYMBOL (type); |
| @@ -1441,7 +1440,7 @@ one trustfile (usually a CA bundle). */) | |||
| 1441 | Lisp_Object warning = XCAR (tail); | 1440 | Lisp_Object warning = XCAR (tail); |
| 1442 | Lisp_Object message = Fgnutls_peer_status_warning_describe (warning); | 1441 | Lisp_Object message = Fgnutls_peer_status_warning_describe (warning); |
| 1443 | if (!NILP (message)) | 1442 | if (!NILP (message)) |
| 1444 | GNUTLS_LOG2 (1, max_log_level, "verification:", SDATA (message)); | 1443 | GNUTLS_LOG2 (1, max_log_level, "verification:", SSDATA (message)); |
| 1445 | } | 1444 | } |
| 1446 | } | 1445 | } |
| 1447 | 1446 | ||