github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-03-25 17:20:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

* src/gnutls.c (ssl_init): Small cleanup fixing output of ncerts

Browse Source
This commit is contained in:
Tim Rühsen 2020-05-22 15:49:12 +02:00
parent c23eaff56f
commit 470a7dfc84
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gnutls.c
View File

@ -102,6 +102,7 @@ ssl_init (void)
const char *ca_directory; const char *ca_directory;
DIR *dir; DIR *dir;
int ncerts = -1; int ncerts = -1;
int rc;
/* GnuTLS should be initialized only once. */ /* GnuTLS should be initialized only once. */
if (ssl_initialized) if (ssl_initialized)
@ -121,7 +122,10 @@ ssl_init (void)
* Also use old behaviour if the CA directory is user-provided. */ * Also use old behaviour if the CA directory is user-provided. */
if (ncerts <= 0) if (ncerts <= 0)
{ {
ncerts = 0;
ca_directory = opt.ca_directory ? opt.ca_directory : "/etc/ssl/certs"; ca_directory = opt.ca_directory ? opt.ca_directory : "/etc/ssl/certs";
if ((dir = opendir (ca_directory)) == NULL) if ((dir = opendir (ca_directory)) == NULL)
{ {
if (opt.ca_directory && *opt.ca_directory) if (opt.ca_directory && *opt.ca_directory)
@ -132,9 +136,6 @@ ssl_init (void)
{ {
struct hash_table *inode_map = hash_table_new (196, NULL, NULL); struct hash_table *inode_map = hash_table_new (196, NULL, NULL);
struct dirent *dent; struct dirent *dent;
int rc;
ncerts = 0;
while ((dent = readdir (dir)) != NULL) while ((dent = readdir (dir)) != NULL)
{ {
@ -169,32 +170,29 @@ ssl_init (void)
if (opt.ca_cert) if (opt.ca_cert)
{ {
int rc; if (ncerts < 0)
ncerts = 0;
ncerts = 0;
if ((rc = gnutls_certificate_set_x509_trust_file (credentials, opt.ca_cert, if ((rc = gnutls_certificate_set_x509_trust_file (credentials, opt.ca_cert,
GNUTLS_X509_FMT_PEM)) <= 0) GNUTLS_X509_FMT_PEM)) <= 0)
logprintf (LOG_NOTQUIET, _ ("ERROR: Failed to open cert %s: (%d).\n"), logprintf (LOG_NOTQUIET, _("ERROR: Failed to open cert %s: (%d).\n"),
opt.ca_cert, rc); opt.ca_cert, rc);
else else
{ {
ncerts += rc; ncerts += rc;
logprintf (LOG_VERBOSE, _ ("Loaded CA certificate '%s'\n"), opt.ca_cert); logprintf (LOG_VERBOSE, _("Loaded CA certificate '%s'\n"), opt.ca_cert);
} }
} }
if (opt.crl_file) if (opt.crl_file)
{ {
int rc;
if ((rc = gnutls_certificate_set_x509_crl_file (credentials, opt.crl_file, GNUTLS_X509_FMT_PEM)) <= 0) if ((rc = gnutls_certificate_set_x509_crl_file (credentials, opt.crl_file, GNUTLS_X509_FMT_PEM)) <= 0)
{ {
logprintf (LOG_NOTQUIET, _("ERROR: Failed to load CRL file '%s': (%d)\n"), opt.crl_file, rc); logprintf (LOG_NOTQUIET, _("ERROR: Failed to load CRL file '%s': (%d)\n"), opt.crl_file, rc);
return false; return false;
} }
logprintf (LOG_VERBOSE, _ ("Loaded CRL file '%s'\n"), opt.crl_file); logprintf (LOG_VERBOSE, _("Loaded CRL file '%s'\n"), opt.crl_file);
} }
DEBUGP (("Certificates loaded: %d\n", ncerts)); DEBUGP (("Certificates loaded: %d\n", ncerts));