mutt stable branch with some hacks
More openssl1.1 fixes: remove uses of X509->name in debugging. (closes #3870)
X509->name was a shortcut for the longer
name = X509_NAME_oneline (X509_get_subject_name (cert),
buf, sizeof (buf));
invocation. Change the debugging to print the cert name and chain
names in the ssl_check_certificate() loop instead.
+12
-5
+12
-5
mutt_ssl.c
+12
-5
mutt_ssl.c
···
666
666
snprintf (buf, sizeof (buf), "%s (%d)",
667
667
X509_verify_cert_error_string(err), err);
668
668
dprint (2, (debugfile, "X509_verify_cert: %s\n", buf));
669
-
dprint (2, (debugfile, " [%s]\n", peercert->name));
670
669
}
671
670
#endif
672
671
X509_STORE_CTX_free (xsc);
···
914
913
915
914
static int ssl_cache_trusted_cert (X509 *c)
916
915
{
917
-
dprint (1, (debugfile, "trusted: %s\n", c->name));
916
+
dprint (1, (debugfile, "ssl_cache_trusted_cert: trusted\n"));
918
917
if (!SslSessionCerts)
919
918
SslSessionCerts = sk_X509_new_null();
920
919
return (sk_X509_push (SslSessionCerts, X509_dup(c)));
···
967
966
int i, preauthrc, chain_len;
968
967
STACK_OF(X509) *chain;
969
968
X509 *cert;
969
+
#ifdef DEBUG
970
+
char buf[STRING];
971
+
972
+
dprint (1, (debugfile, "ssl_check_certificate: checking cert %s\n",
973
+
X509_NAME_oneline (X509_get_subject_name (data->cert),
974
+
buf, sizeof (buf))));
975
+
#endif
970
976
971
977
if ((preauthrc = ssl_check_preauth (data->cert, conn->account.host)) > 0)
972
978
return preauthrc;
···
983
989
{
984
990
cert = sk_X509_value (chain, i);
985
991
992
+
dprint (1, (debugfile, "ssl_check_certificate: checking cert chain entry %s\n",
993
+
X509_NAME_oneline (X509_get_subject_name (cert),
994
+
buf, sizeof (buf))));
995
+
986
996
/* if the certificate validates or is manually accepted, then add it to
987
997
* the trusted set and recheck the peer certificate */
988
998
if (ssl_check_preauth (cert, NULL)
···
1009
1019
FILE *fp;
1010
1020
char *name = NULL, *c;
1011
1021
1012
-
dprint (2, (debugfile, "interactive_check_cert: %s\n", cert->name));
1013
-
1014
1022
menu->max = 19;
1015
1023
menu->dialog = (char **) safe_calloc (1, menu->max * sizeof (char *));
1016
1024
for (i = 0; i < menu->max; i++)
···
1021
1029
row++;
1022
1030
name = X509_NAME_oneline (X509_get_subject_name (cert),
1023
1031
buf, sizeof (buf));
1024
-
dprint (2, (debugfile, "oneline: %s\n", name));
1025
1032
1026
1033
for (i = 0; i < 5; i++)
1027
1034
{