projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
mutt_ssl_gnutls.c
diff --git
a/mutt_ssl_gnutls.c
b/mutt_ssl_gnutls.c
index
1284aa3
..
8f6bd23
100644
(file)
--- a/
mutt_ssl_gnutls.c
+++ b/
mutt_ssl_gnutls.c
@@
-323,8
+323,8
@@
static int tls_compare_certificates (const gnutls_datum * peercert)
return 0;
}
return 0;
}
- ptr = (unsigned char *) strstr (b64_data.data, CERT_SEP) + 1;
- ptr = (unsigned char *) strstr (ptr, CERT_SEP);
+ ptr = (unsigned char *) strstr (
(char*)
b64_data.data, CERT_SEP) + 1;
+ ptr = (unsigned char *) strstr (
(char*)
ptr, CERT_SEP);
b64_data.size = b64_data.size - (ptr - b64_data.data);
b64_data.data = ptr;
b64_data.size = b64_data.size - (ptr - b64_data.data);
b64_data.data = ptr;
@@
-412,8
+412,8
@@
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 (
mutt_str
cmp (linestr + pmatch[1].rm_so, hostname) == 0 &&
-
mutt_str
cmp (linestr + pmatch[2].rm_so, buf) == 0) {
+ if (
str_
cmp (linestr + pmatch[1].rm_so, hostname) == 0 &&
+
str_
cmp (linestr + pmatch[2].rm_so, buf) == 0) {
regfree (&preg);
FREE(&linestr);
fclose (fp);
regfree (&preg);
FREE(&linestr);
fclose (fp);
@@
-449,10
+449,9
@@
static int tls_check_certificate (CONNECTION * conn)
MUTTMENU *menu;
int done, row, i, ret;
FILE *fp;
MUTTMENU *menu;
int done, row, i, ret;
FILE *fp;
- gnutls_x509_dn dn;
time_t t;
const gnutls_datum *cert_list;
time_t t;
const gnutls_datum *cert_list;
- int cert_list_size = 0;
+
unsigned
int cert_list_size = 0;
gnutls_certificate_status certstat;
char datestr[30];
gnutls_x509_crt cert;
gnutls_certificate_status certstat;
char datestr[30];
gnutls_x509_crt cert;
@@
-486,7
+485,7
@@
static int tls_check_certificate (CONNECTION * conn)
/* We only support X.509 certificates (not OpenPGP) at the moment */
if (gnutls_certificate_type_get (state) != GNUTLS_CRT_X509) {
/* We only support X.509 certificates (not OpenPGP) at the moment */
if (gnutls_certificate_type_get (state) != GNUTLS_CRT_X509) {
- mutt_error (_("
Error c
ertificate is not X.509"));
+ mutt_error (_("
C
ertificate is not X.509"));
mutt_sleep (2);
return 0;
}
mutt_sleep (2);
return 0;
}