{
tlssockdata *data = conn->sockdata;
gnutls_session state = data->state;
- char helpstr[SHORT_STRING];
- char buf[SHORT_STRING];
- char fpbuf[SHORT_STRING];
+ char helpstr[STRING];
+ char buf[STRING];
+ char fpbuf[STRING];
ssize_t buflen;
- char dn_common_name[SHORT_STRING];
- char dn_email[SHORT_STRING];
- char dn_organization[SHORT_STRING];
- char dn_organizational_unit[SHORT_STRING];
- char dn_locality[SHORT_STRING];
- char dn_province[SHORT_STRING];
- char dn_country[SHORT_STRING];
+ char dn_common_name[STRING];
+ char dn_email[STRING];
+ char dn_organization[STRING];
+ char dn_organizational_unit[STRING];
+ char dn_locality[STRING];
+ char dn_province[STRING];
+ char dn_country[STRING];
MUTTMENU *menu;
int done, row, i, ret;
FILE *fp;
menu->max = 25;
menu->dialog = p_new(char*, menu->max);
for (i = 0; i < menu->max; i++)
- menu->dialog[i] = p_new(char, SHORT_STRING);
+ menu->dialog[i] = p_new(char, STRING);
row = 0;
- m_strcpy(menu->dialog[row], SHORT_STRING,
+ m_strcpy(menu->dialog[row], STRING,
_("This certificate belongs to:"));
row++;
dn_country, (size_t *)&buflen) != 0)
dn_country[0] = '\0';
- snprintf (menu->dialog[row++], SHORT_STRING, " %s %s", dn_common_name,
+ snprintf (menu->dialog[row++], STRING, " %s %s", dn_common_name,
dn_email);
- snprintf (menu->dialog[row++], SHORT_STRING, " %s", dn_organization);
- snprintf (menu->dialog[row++], SHORT_STRING, " %s",
+ snprintf (menu->dialog[row++], STRING, " %s", dn_organization);
+ snprintf (menu->dialog[row++], STRING, " %s",
dn_organizational_unit);
- snprintf (menu->dialog[row++], SHORT_STRING, " %s %s %s", dn_locality,
+ snprintf (menu->dialog[row++], STRING, " %s %s %s", dn_locality,
dn_province, dn_country);
row++;
- m_strcpy(menu->dialog[row], SHORT_STRING,
+ m_strcpy(menu->dialog[row], STRING,
_("This certificate was issued by:"));
row++;
(cert, GNUTLS_OID_X520_COUNTRY_NAME, 0, 0, dn_country, (size_t *)&buflen) != 0)
dn_country[0] = '\0';
- snprintf (menu->dialog[row++], SHORT_STRING, " %s %s", dn_common_name,
+ snprintf (menu->dialog[row++], STRING, " %s %s", dn_common_name,
dn_email);
- snprintf (menu->dialog[row++], SHORT_STRING, " %s", dn_organization);
- snprintf (menu->dialog[row++], SHORT_STRING, " %s",
+ snprintf (menu->dialog[row++], STRING, " %s", dn_organization);
+ snprintf (menu->dialog[row++], STRING, " %s",
dn_organizational_unit);
- snprintf (menu->dialog[row++], SHORT_STRING, " %s %s %s", dn_locality,
+ snprintf (menu->dialog[row++], STRING, " %s %s %s", dn_locality,
dn_province, dn_country);
row++;
- snprintf (menu->dialog[row++], SHORT_STRING,
+ snprintf (menu->dialog[row++], STRING,
_("This certificate is valid"));
t = gnutls_x509_crt_get_activation_time (cert);
- snprintf (menu->dialog[row++], SHORT_STRING, _(" from %s"),
+ snprintf (menu->dialog[row++], STRING, _(" from %s"),
tls_make_date (t, datestr, 30));
t = gnutls_x509_crt_get_expiration_time (cert);
- snprintf (menu->dialog[row++], SHORT_STRING, _(" to %s"),
+ snprintf (menu->dialog[row++], STRING, _(" to %s"),
tls_make_date (t, datestr, 30));
fpbuf[0] = '\0';
tls_fingerprint (GNUTLS_DIG_SHA, fpbuf, sizeof (fpbuf), &cert_list[0]);
- snprintf (menu->dialog[row++], SHORT_STRING, _("SHA1 Fingerprint: %s"),
+ snprintf (menu->dialog[row++], STRING, _("SHA1 Fingerprint: %s"),
fpbuf);
fpbuf[0] = '\0';
tls_fingerprint (GNUTLS_DIG_MD5, fpbuf, sizeof (fpbuf), &cert_list[0]);
- snprintf (menu->dialog[row++], SHORT_STRING, _("MD5 Fingerprint: %s"),
+ snprintf (menu->dialog[row++], STRING, _("MD5 Fingerprint: %s"),
fpbuf);
if (certerr_notyetvalid) {
row++;
- m_strcpy(menu->dialog[row], SHORT_STRING,
+ m_strcpy(menu->dialog[row], STRING,
_("WARNING: Server certificate is not yet valid"));
}
if (certerr_expired) {
row++;
- m_strcpy(menu->dialog[row], SHORT_STRING,
+ m_strcpy(menu->dialog[row], STRING,
_("WARNING: Server certificate has expired"));
}
if (certerr_revoked) {
row++;
- m_strcpy(menu->dialog[row], SHORT_STRING,
+ m_strcpy(menu->dialog[row], STRING,
_("WARNING: Server certificate has been revoked"));
}
if (certerr_hostname) {
row++;
- m_strcpy(menu->dialog[row], SHORT_STRING,
+ m_strcpy(menu->dialog[row], STRING,
_("WARNING: Server hostname does not match certificate"));
}
if (certerr_signernotca) {
row++;
- m_strcpy(menu->dialog[row], SHORT_STRING,
+ m_strcpy(menu->dialog[row], STRING,
_("WARNING: Signer of server certificate is not a CA"));
}