[svn] Remove implicit declaration warnings.

[wget] / src / gen_sslfunc.c

diff --git a/src/gen_sslfunc.c b/src/gen_sslfunc.c
index 44ff5022e8444c1437d7a5e98db44b753cfe9230..20fd53d71b22adb7b913a93628219f01c3db68d2 100644 (file)
--- a/src/gen_sslfunc.c
+++ b/src/gen_sslfunc.c
@@ -1,41 +1,96 @@
 /* SSL support.
-   Copyright (C) 2000 Christian Fraenkel.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   Contributed by Christian Fraenkel.
 
-This file is part of Wget.
+This file is part of GNU Wget.
 
-This program is free software; you can redistribute it and/or modify
+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
 (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+GNU Wget is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 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 this program; if not, write to the Free Software
+along with Wget; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include <config.h>
+
 #ifdef HAVE_SSL
+
+#include <assert.h>
+#include <errno.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
-#include <assert.h>
-#define SSL_ERR_CTX_CREATION -2
-#include <sys/time.h>
+#include <openssl/rand.h>
+
 #include "wget.h"
 #include "connect.h"
 
-/* #### Shouldn't this be static?  --hniksic */
-int verify_callback PARAMS ((int, X509_STORE_CTX *));
+#ifndef errno
+extern int errno;
+#endif
+
+static int verify_callback PARAMS ((int, X509_STORE_CTX *));
+
+static void
+ssl_init_prng (void)
+{
+#if SSLEAY_VERSION_NUMBER >= 0x00905100
+  if (RAND_status () == 0)
+    {
+      char rand_file[256];
+      time_t t;
+      pid_t pid;
+      long l,seed;
+
+      t = time(NULL);
+      pid = getpid();
+      RAND_file_name(rand_file, 256);
+      if (rand_file != NULL)
+       {
+         /* Seed as much as 1024 bytes from RAND_file_name */
+         RAND_load_file(rand_file, 1024);
+       }
+      /* Seed in time (mod_ssl does this) */
+      RAND_seed((unsigned char *)&t, sizeof(time_t));
+      /* Seed in pid (mod_ssl does this) */
+      RAND_seed((unsigned char *)&pid, sizeof(pid_t));
+      /* Initialize system's random number generator */
+      RAND_bytes((unsigned char *)&seed, sizeof(long));
+      srand48(seed);
+      while (RAND_status () == 0)
+       {
+         /* Repeatedly seed the PRNG using the system's random number
+            generator until it has been seeded with enough data.  */
+         l = lrand48();
+         RAND_seed((unsigned char *)&l, sizeof(long));
+       }
+      if (rand_file != NULL)
+       {
+         /* Write a rand_file */
+         RAND_write_file(rand_file);
+       }
+    }
+#endif /* SSLEAY_VERSION_NUMBER >= 0x00905100 */
+  return;
+}
+
 
 /* Creates a SSL Context and sets some defaults for it */
-int
+uerr_t
 init_ssl (SSL_CTX **ctx)
 {
   SSL_METHOD *meth = NULL;
@@ -47,7 +102,19 @@ init_ssl (SSL_CTX **ctx)
   meth = SSLv23_client_method ();
   *ctx = SSL_CTX_new (meth);
   SSL_CTX_set_verify (*ctx, verify, verify_callback);
-  if (*ctx == NULL) return SSL_ERR_CTX_CREATION;
+  if (*ctx == NULL) return SSLERRCTXCREATE;
+  if (opt.sslcertfile)
+    {
+      if (SSL_CTX_use_certificate_file (*ctx, opt.sslcertfile,
+                                       SSL_FILETYPE_PEM) <= 0)
+       return SSLERRCERTFILE;
+      if (opt.sslcertkey == NULL) 
+       opt.sslcertkey=opt.sslcertfile;
+      if (SSL_CTX_use_PrivateKey_file (*ctx, opt.sslcertkey,
+                                      SSL_FILETYPE_PEM) <= 0)
+       return SSLERRCERTKEY;
+  }
+  ssl_init_prng();
   return 0; /* Succeded */
 }
 
@@ -64,6 +131,9 @@ connect_ssl (SSL **con, SSL_CTX *ctx, int fd)
   SSL_connect (*con);  
   if ((*con)->state != SSL_ST_OK)
     return 1;
+  /*while((SSLerror=ERR_get_error())!=0)
+    printf("%s\n", ERR_error_string(SSLerror,NULL));*/
+
   return 0;
 }
 
@@ -97,6 +167,23 @@ verify_callback (int ok, X509_STORE_CTX *ctx)
   return ok;
 }
 
+/* pass all ssl errors to DEBUGP
+   returns the number of printed errors */
+int
+ssl_printerrors (void) 
+{
+  int ocerr = 0;
+  unsigned long curerr = 0;
+  char errbuff[1024];
+  memset(errbuff, 0, sizeof(errbuff));
+  for (curerr = ERR_get_error (); curerr; curerr = ERR_get_error ())
+    {
+      DEBUGP (("OpenSSL: %s\n", ERR_error_string (curerr, errbuff)));
+      ++ocerr;
+    }
+  return ocerr;
+}
+
 /* SSL version of iread. Only exchanged read for SSL_read 
    Read at most LEN bytes from FD, storing them to BUF.  This is
    virtually the same as read(), but takes care of EINTR braindamage