projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
mutt_ssl_gnutls.c
diff --git
a/mutt_ssl_gnutls.c
b/mutt_ssl_gnutls.c
index
5bf6b5a
..
e160bd6
100644
(file)
--- a/
mutt_ssl_gnutls.c
+++ b/
mutt_ssl_gnutls.c
@@
-23,10
+23,11
@@
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mutt_ssl.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mutt_ssl.h"
-#include "mutt_regex.h"
#include "lib/mem.h"
#include "lib/mem.h"
+#include "lib/str.h"
#include "lib/intl.h"
#include "lib/intl.h"
+#include "lib/rx.h"
typedef struct _tlssockdata {
gnutls_session state;
typedef struct _tlssockdata {
gnutls_session state;
@@
-268,7
+269,7
@@
static int tls_socket_close (CONNECTION * conn)
gnutls_certificate_free_credentials (data->xcred);
gnutls_deinit (data->state);
gnutls_certificate_free_credentials (data->xcred);
gnutls_deinit (data->state);
-
safe_free ((void **)
&conn->sockdata);
+
FREE(
&conn->sockdata);
}
return raw_socket_close (conn);
}
return raw_socket_close (conn);
@@
-411,10
+412,10
@@
static int tls_check_stored_hostname (const gnutls_datum * cert,
if (regexec (&preg, linestr, 3, pmatch, 0) == 0) {
linestr[pmatch[1].rm_eo] = '\0';
linestr[pmatch[2].rm_eo] = '\0';
if (regexec (&preg, linestr, 3, pmatch, 0) == 0) {
linestr[pmatch[1].rm_eo] = '\0';
linestr[pmatch[2].rm_eo] = '\0';
- if (strcmp (linestr + pmatch[1].rm_so, hostname) == 0 &&
- strcmp (linestr + pmatch[2].rm_so, buf) == 0) {
+ if (s
afe_s
trcmp (linestr + pmatch[1].rm_so, hostname) == 0 &&
+ s
afe_s
trcmp (linestr + pmatch[2].rm_so, buf) == 0) {
regfree (&preg);
regfree (&preg);
-
safe_free ((void **)
&linestr);
+
FREE(
&linestr);
fclose (fp);
return 1;
}
fclose (fp);
return 1;
}