Fix some problems under VMS.

[wget] / src / openssl.c

diff --git a/src/openssl.c b/src/openssl.c
index a1b35b21cdb6f6344fc8c0cac837900a7c284c08..bc37491561228a750040b9e2361cbc75bacec1e1 100644 (file)
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -161,7 +161,7 @@ key_type_to_ssl_type (enum keyfile_type type)
 bool
 ssl_init ()
 {
-  SSL_METHOD *meth;
+  SSL_METHOD const *meth;
 
   if (ssl_ctx)
     /* The SSL has already been initialized. */
@@ -201,7 +201,9 @@ ssl_init ()
       abort ();
     }
 
-  ssl_ctx = SSL_CTX_new (meth);
+  /* The type cast below accommodates older OpenSSL versions (0.9.8)
+     where SSL_CTX_new() is declared without a "const" argument. */
+  ssl_ctx = SSL_CTX_new ((SSL_METHOD *)meth);
   if (!ssl_ctx)
     goto error;
 
@@ -263,8 +265,8 @@ openssl_read (int fd, char *buf, int bufsize, void *arg)
   do
     ret = SSL_read (conn, buf, bufsize);
   while (ret == -1
-             || (SSL_get_error (conn, ret) == SSL_ERROR_SYSCALL
-                 && errno == EINTR));
+         && SSL_get_error (conn, ret) == SSL_ERROR_SYSCALL
+         && errno == EINTR);
 
   return ret;
 }