moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Further quote*()-related integrations in openssl.c.

Browse Source
This commit is contained in:
Steven Schubiger 2008-04-26 14:34:30 +02:00
parent 883ff34537
commit aeced96fae
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/openssl.c
View File

@ -495,7 +495,7 @@ ssl_check_certificate (int fd, const char *host)
if (!cert) if (!cert)
{ {
logprintf (LOG_NOTQUIET, _("%s: No certificate presented by %s.\n"), logprintf (LOG_NOTQUIET, _("%s: No certificate presented by %s.\n"),
severity, escnonprint (host)); severity, quotearg_style (escape_quoting_style, host));
success = false; success = false;
goto no_cert; /* must bail out since CERT is NULL */ goto no_cert; /* must bail out since CERT is NULL */
} }
@ -505,7 +505,8 @@ ssl_check_certificate (int fd, const char *host)
char *subject = X509_NAME_oneline (X509_get_subject_name (cert), 0, 0); char *subject = X509_NAME_oneline (X509_get_subject_name (cert), 0, 0);
char *issuer = X509_NAME_oneline (X509_get_issuer_name (cert), 0, 0); char *issuer = X509_NAME_oneline (X509_get_issuer_name (cert), 0, 0);
DEBUGP (("certificate:\n subject: %s\n issuer: %s\n", DEBUGP (("certificate:\n subject: %s\n issuer: %s\n",
escnonprint (subject), escnonprint (issuer))); quotearg_style (escape_quoting_style, subject),
quotearg_style (escape_quoting_style, issuer)));
OPENSSL_free (subject); OPENSSL_free (subject);
OPENSSL_free (issuer); OPENSSL_free (issuer);
} }
@ -516,7 +517,8 @@ ssl_check_certificate (int fd, const char *host)
char *issuer = X509_NAME_oneline (X509_get_issuer_name (cert), 0, 0); char *issuer = X509_NAME_oneline (X509_get_issuer_name (cert), 0, 0);
logprintf (LOG_NOTQUIET, logprintf (LOG_NOTQUIET,
_("%s: cannot verify %s's certificate, issued by %s:\n"), _("%s: cannot verify %s's certificate, issued by %s:\n"),
severity, escnonprint (host), quote (escnonprint (issuer))); severity, quotearg_style (escape_quoting_style, host),
quote (issuer));
/* Try to print more user-friendly (and translated) messages for /* Try to print more user-friendly (and translated) messages for
the frequent verification errors. */ the frequent verification errors. */
switch (vresult) switch (vresult)
@ -567,20 +569,20 @@ ssl_check_certificate (int fd, const char *host)
{ {
logprintf (LOG_NOTQUIET, _("\ logprintf (LOG_NOTQUIET, _("\
%s: certificate common name %s doesn't match requested host name %s.\n"), %s: certificate common name %s doesn't match requested host name %s.\n"),
severity, quote (escnonprint (common_name)), quote (escnonprint (host))); severity, quote (common_name), quote (host));
success = false; success = false;
} }
if (success) if (success)
DEBUGP (("X509 certificate successfully verified and matches host %s\n", DEBUGP (("X509 certificate successfully verified and matches host %s\n",
escnonprint (host))); quotearg_style (escape_quoting_style, host)));
X509_free (cert); X509_free (cert);
no_cert: no_cert:
if (opt.check_cert && !success) if (opt.check_cert && !success)
logprintf (LOG_NOTQUIET, _("\ logprintf (LOG_NOTQUIET, _("\
To connect to %s insecurely, use `--no-check-certificate'.\n"), To connect to %s insecurely, use `--no-check-certificate'.\n"),
escnonprint (host)); quotearg_style (escape_quoting_style, host));
/* Allow --no-check-cert to disable certificate checking. */ /* Allow --no-check-cert to disable certificate checking. */
return opt.check_cert ? success : true; return opt.check_cert ? success : true;