Eschew config-post.h.

[wget] / src / gnutls.c

diff --git a/src/gnutls.c b/src/gnutls.c
index 05cd0df169bfd468e4d1e23219c43f50b2298585..a7c253f1b3e6678acf2348a68476cdaba008dad5 100644 (file)
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1,11 +1,11 @@
 /* SSL support via GnuTLS library.
-   Copyright (C) 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Wget; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
@@ -27,7 +26,7 @@ modify this file, you may extend this exception to your version of the
 file, but you are not obligated to do so.  If you do not wish to do
 so, delete this exception statement from your version.  */
 
-#include <config.h>
+#include "wget.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -40,7 +39,6 @@ so, delete this exception statement from your version.  */
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
-#include "wget.h"
 #include "utils.h"
 #include "connect.h"
 #include "url.h"
@@ -60,13 +58,13 @@ ssl_init ()
   gnutls_certificate_allocate_credentials (&credentials);
   if (opt.ca_cert)
     gnutls_certificate_set_x509_trust_file (credentials, opt.ca_cert,
-                                           GNUTLS_X509_FMT_PEM);
+                                            GNUTLS_X509_FMT_PEM);
   return true;
 }
 
 struct wgnutls_transport_context {
-  gnutls_session session;      /* GnuTLS session handle */
-  int last_error;              /* last error returned by read/write/... */
+  gnutls_session session;       /* GnuTLS session handle */
+  int last_error;               /* last error returned by read/write/... */
 
   /* Since GnuTLS doesn't support the equivalent to recv(...,
      MSG_PEEK) or SSL_peek(), we have to do it ourselves.  Peeked data
@@ -93,9 +91,9 @@ wgnutls_read (int fd, char *buf, int bufsize, void *arg)
       memcpy (buf, ctx->peekbuf + ctx->peekstart, copysize);
       ctx->peeklen -= copysize;
       if (ctx->peeklen != 0)
-       ctx->peekstart += copysize;
+        ctx->peekstart += copysize;
       else
-       ctx->peekstart = 0;
+        ctx->peekstart = 0;
       return copysize;
     }
 
@@ -224,7 +222,7 @@ ssl_check_certificate (int fd, const char *host)
   if (err < 0)
     {
       logprintf (LOG_NOTQUIET, _("%s: No certificate presented by %s.\n"),
-                severity, escnonprint (host));
+                 severity, escnonprint (host));
       success = false;
       goto out;
     }
@@ -232,19 +230,19 @@ ssl_check_certificate (int fd, const char *host)
   if (status & GNUTLS_CERT_INVALID)
     {
       logprintf (LOG_NOTQUIET, _("%s: The certificate of `%s' is not trusted.\n"),
-                severity, escnonprint (host));
+                 severity, escnonprint (host));
       success = false;
     }
   if (status & GNUTLS_CERT_SIGNER_NOT_FOUND)
     {
       logprintf (LOG_NOTQUIET, _("%s: The certificate of `%s' hasn't got a known issuer.\n"),
-                severity, escnonprint (host));
+                 severity, escnonprint (host));
       success = false;
     }
   if (status & GNUTLS_CERT_REVOKED)
     {
       logprintf (LOG_NOTQUIET, _("%s: The certificate of `%s' has been revoked.\n"),
-                severity, escnonprint (host));
+                 severity, escnonprint (host));
       success = false;
     }
 
@@ -256,45 +254,45 @@ ssl_check_certificate (int fd, const char *host)
       unsigned int cert_list_size;
 
       if ((err = gnutls_x509_crt_init (&cert)) < 0)
-       {
-         logprintf (LOG_NOTQUIET, _("Error initializing X509 certificate: %s\n"),
-                    gnutls_strerror (err));
-         success = false;
-         goto out;
-       }
+        {
+          logprintf (LOG_NOTQUIET, _("Error initializing X509 certificate: %s\n"),
+                     gnutls_strerror (err));
+          success = false;
+          goto out;
+        }
 
       cert_list = gnutls_certificate_get_peers (ctx->session, &cert_list_size);
       if (!cert_list)
-       {
-         logprintf (LOG_NOTQUIET, _("No certificate found\n"));
-         success = false;
-         goto out;
-       }
+        {
+          logprintf (LOG_NOTQUIET, _("No certificate found\n"));
+          success = false;
+          goto out;
+        }
       err = gnutls_x509_crt_import (cert, cert_list, GNUTLS_X509_FMT_DER);
       if (err < 0)
-       {
-         logprintf (LOG_NOTQUIET, _("Error parsing certificate: %s\n"),
-                    gnutls_strerror (err));
-         success = false;
-         goto out;
-       }
+        {
+          logprintf (LOG_NOTQUIET, _("Error parsing certificate: %s\n"),
+                     gnutls_strerror (err));
+          success = false;
+          goto out;
+        }
       if (now < gnutls_x509_crt_get_activation_time (cert))
-       {
-         logprintf (LOG_NOTQUIET, _("The certificate has not yet been activated\n"));
-         success = false;
-       }
+        {
+          logprintf (LOG_NOTQUIET, _("The certificate has not yet been activated\n"));
+          success = false;
+        }
       if (now >= gnutls_x509_crt_get_expiration_time (cert))
-       {
-         logprintf (LOG_NOTQUIET, _("The certificate has expired\n"));
-         success = false;
-       }
+        {
+          logprintf (LOG_NOTQUIET, _("The certificate has expired\n"));
+          success = false;
+        }
       if (!gnutls_x509_crt_check_hostname (cert, host))
-       {
-         logprintf (LOG_NOTQUIET,
-                    _("The certificate's owner does not match hostname '%s'\n"),
-                    host);
-         success = false;
-       }
+        {
+          logprintf (LOG_NOTQUIET,
+                     _("The certificate's owner does not match hostname '%s'\n"),
+                     host);
+          success = false;
+        }
       gnutls_x509_crt_deinit (cert);
    }