Encryption changes (use TLS/SSL method as needed)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@1484 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cups/http.c b/cups/http.c
index b8506f70f59186f97a8b268c72f99a67b2da094b..19509e1627d25dffa01b0fa2b05fdc0ec90bc463 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.c,v 1.71 2000/12/19 15:10:38 mike Exp $"
+ * "$Id: http.c,v 1.72 2000/12/20 10:50:59 mike Exp $"
  *
  *   HTTP routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -489,7 +489,7 @@ httpReconnect(http_t *http) /* I - HTTP data */
          break;
     }
 
-    context = SSL_CTX_new(TLSv1_method());
+    context = SSL_CTX_new(SSLv23_method());
     conn    = SSL_new(context);
 
     SSL_set_fd(conn, http->fd);
@@ -1486,7 +1486,7 @@ httpUpdate(http_t *http)          /* I - HTTP data */
 #ifdef HAVE_LIBSSL
       if (http->status == HTTP_SWITCHING_PROTOCOLS && !http->tls)
       {
-       context = SSL_CTX_new(TLSv1_method());
+       context = SSL_CTX_new(SSLv23_method());
        conn    = SSL_new(context);
 
        SSL_set_fd(conn, http->fd);
@@ -1889,5 +1889,5 @@ http_send(http_t       *http,     /* I - HTTP data */
 
 
 /*
- * End of "$Id: http.c,v 1.71 2000/12/19 15:10:38 mike Exp $".
+ * End of "$Id: http.c,v 1.72 2000/12/20 10:50:59 mike Exp $".
  */

diff --git a/scheduler/client.c b/scheduler/client.c
index 9a9c95e0540b979dca50ac22c6c38f4505b1e09d..6f583d507db8ef877ca45f8c28616f142d186103 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c,v 1.77 2000/12/19 15:10:41 mike Exp $"
+ * "$Id: client.c,v 1.78 2000/12/20 10:51:00 mike Exp $"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -270,7 +270,7 @@ EncryptClient(client_t *con)        /* I - Client to encrypt */
   SSL_CTX      *context;       /* Context for encryption */
   SSL          *conn;          /* Connection for encryption */
   
-  context = SSL_CTX_new(TLSv1_method());
+  context = SSL_CTX_new(SSLv23_method());
   conn    = SSL_new(context);
 
   SSL_use_PrivateKey_file(conn, ServerKey, SSL_FILETYPE_PEM);
@@ -1924,5 +1924,5 @@ pipe_command(client_t *con,       /* I - Client connection */
 
 
 /*
- * End of "$Id: client.c,v 1.77 2000/12/19 15:10:41 mike Exp $".
+ * End of "$Id: client.c,v 1.78 2000/12/20 10:51:00 mike Exp $".
  */