Encryption was broken with OpenSSL.

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

diff --git a/CHANGES-1.5.txt b/CHANGES-1.5.txt
index 909dd9579b16f57aabd553a7a414df2da1ffdd51..6fb65891c98a8f48e7af46e8af045a5be7a1ff7b 100644 (file)
--- a/CHANGES-1.5.txt
+++ b/CHANGES-1.5.txt
@@ -4,6 +4,7 @@ CHANGES-1.5.txt
 CHANGES IN CUPS V1.5.1
 
        - Documentation updates (STR #3885)
+       - Encryption was broken with OpenSSL.
        - ipptool's XML output used date/time values with timezone offsets,
          which are not supported by Mac OS X's NSDate class.
        - Several programs did not support the cupsFilter2 keyword in PPD files.

diff --git a/cups/http.c b/cups/http.c
index 1daec0d38488bb5004bd0dc038a3f285188ea08c..6f673808ac39e0915c9e5772f7beb058397d0087 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -3807,6 +3807,8 @@ http_setup_ssl(http_t *http)              /* I - Connection to server */
     any_root = cg->any_root;
 
 #  ifdef HAVE_LIBSSL
+  (void)any_root;
+
   context = SSL_CTX_new(SSLv23_client_method());
 
   SSL_CTX_set_options(context, SSL_OP_NO_SSLv2); /* Only use SSLv3 or TLS */
@@ -3815,7 +3817,7 @@ http_setup_ssl(http_t *http)              /* I - Connection to server */
   BIO_ctrl(bio, BIO_C_SET_FILE_PTR, 0, (char *)http);
 
   http->tls = SSL_new(context);
-  SSL_set_bio(http->tls_credentials, bio, bio);
+  SSL_set_bio(http->tls, bio, bio);
 
   if (SSL_connect(http->tls) != 1)
   {
@@ -4200,11 +4202,11 @@ http_shutdown_ssl(http_t *http)         /* I - Connection to server */
 #  ifdef HAVE_LIBSSL
   SSL_CTX      *context;               /* Context for encryption */
 
-  context = SSL_get_SSL_CTX(http->tls_credentials);
+  context = SSL_get_SSL_CTX(http->tls);
 
-  SSL_shutdown(http->tls_credentials);
+  SSL_shutdown(http->tls);
   SSL_CTX_free(context);
-  SSL_free(http->tls_credentials);
+  SSL_free(http->tls);
 
 #  elif defined(HAVE_GNUTLS)
   gnutls_certificate_client_credentials *credentials;