deprecate USE_SSL for USE_TLS, rename in code

doc/examples/tlsauthentication.c

@@ -250,7 +250,7 @@ main ()
     }
 
   daemon =
-    MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL, PORT, NULL,
+    MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_TLS, PORT, NULL,
                       NULL, &answer_to_connection, NULL,
                       MHD_OPTION_HTTPS_MEM_KEY, key_pem,
                       MHD_OPTION_HTTPS_MEM_CERT, cert_pem, MHD_OPTION_END);

src/examples/benchmark_https.c

@@ -180,7 +180,7 @@ main (int argc, char *const *argv)
   response = MHD_create_response_from_buffer (strlen (PAGE),
 					      (void *) PAGE,
 					      MHD_RESPMEM_PERSISTENT);
-  d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL
+  d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_TLS
 #ifdef EPOLL_SUPPORT
 			| MHD_USE_EPOLL | MHD_USE_EPOLL_TURBO
 #endif

src/examples/demo_https.c

@@ -932,7 +932,7 @@ main (int argc, char *const *argv)
 							     MHD_RESPMEM_PERSISTENT);
   mark_as_html (internal_error_response);
   update_directory ();
-  d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | MHD_USE_SSL
+  d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | MHD_USE_TLS
 #ifdef EPOLL_SUPPORT
 			| MHD_USE_EPOLL
 #endif

src/examples/https_fileserver_example.c

@@ -192,7 +192,7 @@ main (int argc, char *const *argv)
       /* gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0); */
       TLS_daemon =
         MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG |
-                          MHD_USE_SSL, atoi (argv[1]), NULL, NULL, &http_ahc,
+                          MHD_USE_TLS, atoi (argv[1]), NULL, NULL, &http_ahc,
                           NULL, MHD_OPTION_CONNECTION_TIMEOUT, 256,
                           MHD_OPTION_HTTPS_MEM_KEY, key_pem,
                           MHD_OPTION_HTTPS_MEM_CERT, cert_pem,

src/include/microhttpd.h

@@ -2757,7 +2757,7 @@ enum MHD_FEATURE
 
   /**
    * Get whether HTTPS is supported.  If supported then flag
-   * #MHD_USE_SSL and options #MHD_OPTION_HTTPS_MEM_KEY,
+   * #MHD_USE_TLS and options #MHD_OPTION_HTTPS_MEM_KEY,
    * #MHD_OPTION_HTTPS_MEM_CERT, #MHD_OPTION_HTTPS_MEM_TRUST,
    * #MHD_OPTION_HTTPS_MEM_DHPARAMS, #MHD_OPTION_HTTPS_CRED_TYPE,
    * #MHD_OPTION_HTTPS_PRIORITIES can be used.

src/microhttpd/connection.c

@@ -595,7 +595,7 @@ try_ready_normal_body (struct MHD_Connection *connection)
     return MHD_YES; /* response already ready */
 #if LINUX
   if ( (MHD_INVALID_SOCKET != response->fd) &&
-       (0 == (connection->daemon->options & MHD_USE_SSL)) )
+       (0 == (connection->daemon->options & MHD_USE_TLS)) )
     {
       /* will use sendfile, no need to bother response crc */
       return MHD_YES;

src/microhttpd/daemon.c

@@ -1133,7 +1133,7 @@ thread_main_connection_upgrade (struct MHD_Connection *con)
   /* Here, we need to bi-directionally forward
      until the application tells us that it is done
      with the socket; */
-  if ( (0 != (daemon->options & MHD_USE_SSL)) &&
+  if ( (0 != (daemon->options & MHD_USE_TLS)) &&
       (0 == (daemon->options & MHD_USE_POLL)))
     {
       while (MHD_CONNECTION_UPGRADE == con->state)
@@ -1193,7 +1193,7 @@ thread_main_connection_upgrade (struct MHD_Connection *con)
         }
     }
 #ifdef HAVE_POLL
-  else if (0 != (daemon->options & MHD_USE_SSL))
+  else if (0 != (daemon->options & MHD_USE_TLS))
     {
       /* use poll() */
       const unsigned int timeout = UINT_MAX;
@@ -1619,7 +1619,7 @@ send_param_adapter (struct MHD_Connection *connection,
     i = INT_MAX; /* return value limit */
 #endif /* MHD_WINSOCK_SOCKETS */
 
-  if (0 != (connection->daemon->options & MHD_USE_SSL))
+  if (0 != (connection->daemon->options & MHD_USE_TLS))
     return (ssize_t) send (connection->socket_fd,
                            other,
                            (MHD_SCKT_SEND_SIZE_) i,
@@ -1939,7 +1939,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
     }
 
 #if HTTPS_SUPPORT
-  if (0 != (daemon->options & MHD_USE_SSL))
+  if (0 != (daemon->options & MHD_USE_TLS))
     {
       connection->recv_cls = &recv_tls_adapter;
       connection->send_cls = &send_tls_adapter;
@@ -2628,7 +2628,7 @@ MHD_get_timeout (struct MHD_Daemon *daemon,
 	       (earliest_deadline > pos->last_activity + pos->connection_timeout) )
 	    earliest_deadline = pos->last_activity + pos->connection_timeout;
 #if HTTPS_SUPPORT
-	  if (  (0 != (daemon->options & MHD_USE_SSL)) &&
+	  if (  (0 != (daemon->options & MHD_USE_TLS)) &&
 		(0 != gnutls_record_check_pending (pos->tls_session)) )
 	    earliest_deadline = 0;
 #endif
@@ -2644,7 +2644,7 @@ MHD_get_timeout (struct MHD_Daemon *daemon,
 	   (earliest_deadline > pos->last_activity + pos->connection_timeout) )
 	earliest_deadline = pos->last_activity + pos->connection_timeout;
 #if HTTPS_SUPPORT
-      if (  (0 != (daemon->options & MHD_USE_SSL)) &&
+      if (  (0 != (daemon->options & MHD_USE_TLS)) &&
 	    (0 != gnutls_record_check_pending (pos->tls_session)) )
 	earliest_deadline = 0;
 #endif
@@ -3955,46 +3955,46 @@ parse_options_va (struct MHD_Daemon *daemon,
           break;
 #if HTTPS_SUPPORT
         case MHD_OPTION_HTTPS_MEM_KEY:
-	  if (0 != (daemon->options & MHD_USE_SSL))
+	  if (0 != (daemon->options & MHD_USE_TLS))
 	    daemon->https_mem_key = va_arg (ap,
                                             const char *);
 #ifdef HAVE_MESSAGES
 	  else
 	    MHD_DLOG (daemon,
-		      _("MHD HTTPS option %d passed to MHD but MHD_USE_SSL not set\n"),
+		      _("MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"),
 		      opt);
 #endif
           break;
         case MHD_OPTION_HTTPS_KEY_PASSWORD:
-	  if (0 != (daemon->options & MHD_USE_SSL))
+	  if (0 != (daemon->options & MHD_USE_TLS))
 	    daemon->https_key_password = va_arg (ap,
                                                  const char *);
 #ifdef HAVE_MESSAGES
 	  else
 	    MHD_DLOG (daemon,
-		      _("MHD HTTPS option %d passed to MHD but MHD_USE_SSL not set\n"),
+		      _("MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"),
 		      opt);
 #endif
           break;
         case MHD_OPTION_HTTPS_MEM_CERT:
-	  if (0 != (daemon->options & MHD_USE_SSL))
+	  if (0 != (daemon->options & MHD_USE_TLS))
 	    daemon->https_mem_cert = va_arg (ap,
                                              const char *);
 #ifdef HAVE_MESSAGES
 	  else
 	    MHD_DLOG (daemon,
-		      _("MHD HTTPS option %d passed to MHD but MHD_USE_SSL not set\n"),
+		      _("MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"),
 		      opt);
 #endif
           break;
         case MHD_OPTION_HTTPS_MEM_TRUST:
-	  if (0 != (daemon->options & MHD_USE_SSL))
+	  if (0 != (daemon->options & MHD_USE_TLS))
 	    daemon->https_mem_trust = va_arg (ap,
                                               const char *);
 #ifdef HAVE_MESSAGES
 	  else
 	    MHD_DLOG (daemon,
-		      _("MHD HTTPS option %d passed to MHD but MHD_USE_SSL not set\n"),
+		      _("MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"),
 		      opt);
 #endif
           break;
@@ -4003,7 +4003,7 @@ parse_options_va (struct MHD_Daemon *daemon,
                                                                   int);
 	  break;
         case MHD_OPTION_HTTPS_MEM_DHPARAMS:
-          if (0 != (daemon->options & MHD_USE_SSL))
+          if (0 != (daemon->options & MHD_USE_TLS))
             {
               const char *arg = va_arg (ap,
                                         const char *);
@@ -4036,14 +4036,14 @@ parse_options_va (struct MHD_Daemon *daemon,
             {
 #ifdef HAVE_MESSAGES
               MHD_DLOG (daemon,
-                        _("MHD HTTPS option %d passed to MHD but MHD_USE_SSL not set\n"),
+                        _("MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"),
                         opt);
 #endif
               return MHD_NO;
             }
           break;
         case MHD_OPTION_HTTPS_PRIORITIES:
-	  if (0 != (daemon->options & MHD_USE_SSL))
+	  if (0 != (daemon->options & MHD_USE_TLS))
 	    {
 	      gnutls_priority_deinit (daemon->priority_cache);
 	      ret = gnutls_priority_init (&daemon->priority_cache,
@@ -4070,7 +4070,7 @@ parse_options_va (struct MHD_Daemon *daemon,
 #endif
           return MHD_NO;
 #else
-          if (0 != (daemon->options & MHD_USE_SSL))
+          if (0 != (daemon->options & MHD_USE_TLS))
             daemon->cert_callback = va_arg (ap,
                                             gnutls_certificate_retrieve_function2 *);
           break;
@@ -4396,7 +4396,7 @@ MHD_start_daemon_va (unsigned int flags,
     return NULL;
 #endif
 #if ! HTTPS_SUPPORT
-  if (0 != (flags & MHD_USE_SSL))
+  if (0 != (flags & MHD_USE_TLS))
     return NULL;
 #endif
 #ifndef TCP_FASTOPEN
@@ -4418,7 +4418,7 @@ MHD_start_daemon_va (unsigned int flags,
 #endif
   /* try to open listen socket */
 #if HTTPS_SUPPORT
-  if (0 != (flags & MHD_USE_SSL))
+  if (0 != (flags & MHD_USE_TLS))
     {
       gnutls_priority_init (&daemon->priority_cache,
 			    "NORMAL",
@@ -4488,7 +4488,7 @@ MHD_start_daemon_va (unsigned int flags,
   daemon->nonce_nc_size = 4; /* tiny */
 #endif
 #if HTTPS_SUPPORT
-  if (0 != (flags & MHD_USE_SSL))
+  if (0 != (flags & MHD_USE_TLS))
     {
       daemon->cred_type = GNUTLS_CRD_CERTIFICATE;
     }
@@ -4500,7 +4500,7 @@ MHD_start_daemon_va (unsigned int flags,
                                    ap))
     {
 #if HTTPS_SUPPORT
-      if ( (0 != (flags & MHD_USE_SSL)) &&
+      if ( (0 != (flags & MHD_USE_TLS)) &&
 	   (NULL != daemon->priority_cache) )
 	gnutls_priority_deinit (daemon->priority_cache);
 #endif
@@ -4518,7 +4518,7 @@ MHD_start_daemon_va (unsigned int flags,
 		    _("Specified value for NC_SIZE too large\n"));
 #endif
 #if HTTPS_SUPPORT
-	  if (0 != (flags & MHD_USE_SSL))
+	  if (0 != (flags & MHD_USE_TLS))
 	    gnutls_priority_deinit (daemon->priority_cache);
 #endif
 	  free (daemon);
@@ -4533,7 +4533,7 @@ MHD_start_daemon_va (unsigned int flags,
 		    MHD_strerror_ (errno));
 #endif
 #if HTTPS_SUPPORT
-	  if (0 != (flags & MHD_USE_SSL))
+	  if (0 != (flags & MHD_USE_TLS))
 	    gnutls_priority_deinit (daemon->priority_cache);
 #endif
 	  free (daemon);
@@ -4548,7 +4548,7 @@ MHD_start_daemon_va (unsigned int flags,
 		_("MHD failed to initialize nonce-nc mutex\n"));
 #endif
 #if HTTPS_SUPPORT
-      if (0 != (flags & MHD_USE_SSL))
+      if (0 != (flags & MHD_USE_TLS))
 	gnutls_priority_deinit (daemon->priority_cache);
 #endif
       free (daemon->nnc);
@@ -4897,7 +4897,7 @@ MHD_start_daemon_va (unsigned int flags,
 
 #if HTTPS_SUPPORT
   /* initialize HTTPS daemon certificate aspects & send / recv functions */
-  if ( (0 != (flags & MHD_USE_SSL)) &&
+  if ( (0 != (flags & MHD_USE_TLS)) &&
        (0 != MHD_TLS_init (daemon)) )
     {
 #ifdef HAVE_MESSAGES
@@ -5090,7 +5090,7 @@ thread_failed:
   MHD_mutex_destroy_chk_ (&daemon->nnc_lock);
 #endif
 #if HTTPS_SUPPORT
-  if (0 != (flags & MHD_USE_SSL))
+  if (0 != (flags & MHD_USE_TLS))
     gnutls_priority_deinit (daemon->priority_cache);
 #endif
   if (MHD_ITC_IS_VALID_(daemon->itc))
@@ -5351,7 +5351,7 @@ MHD_stop_daemon (struct MHD_Daemon *daemon)
       gnutls_dh_params_deinit (daemon->https_mem_dhparams);
       daemon->have_dhparams = MHD_NO;
     }
-  if (0 != (daemon->options & MHD_USE_SSL))
+  if (0 != (daemon->options & MHD_USE_TLS))
     {
       gnutls_priority_deinit (daemon->priority_cache);
       if (daemon->x509_cred)

src/microhttpd/response.c

@@ -638,7 +638,7 @@ MHD_upgrade_action (struct MHD_UpgradeResponseHandle *urh,
     if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION) )
       {
 #if HTTPS_SUPPORT
-        if (0 != (daemon->options & MHD_USE_SSL) )
+        if (0 != (daemon->options & MHD_USE_TLS) )
           {
             /* signal thread that app is done by shutdown() of 'app' socket */
             shutdown (urh->app.socket,
@@ -650,7 +650,7 @@ MHD_upgrade_action (struct MHD_UpgradeResponseHandle *urh,
         return MHD_YES;
       }
 #if HTTPS_SUPPORT
-    if (0 != (daemon->options & MHD_USE_SSL) )
+    if (0 != (daemon->options & MHD_USE_TLS) )
       {
         urh->was_closed = MHD_YES;
         if (MHD_INVALID_SOCKET != urh->app.socket)
@@ -712,7 +712,7 @@ MHD_response_execute_upgrade_ (struct MHD_Response *response,
   rbo = connection->read_buffer_offset;
   connection->read_buffer_offset = 0;
 #if HTTPS_SUPPORT
-  if (0 != (daemon->options & MHD_USE_SSL) )
+  if (0 != (daemon->options & MHD_USE_TLS) )
   {
     struct MemoryPool *pool;
     size_t avail;

src/testcurl/https/test_empty_response.c

@@ -80,7 +80,7 @@ testInternalSelectGet ()
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_SSL | MHD_USE_SELECT_INTERNALLY,
+  d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_TLS | MHD_USE_SELECT_INTERNALLY,
                         1082, NULL, NULL, &ahc_echo, "GET", 
                         MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
                         MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,

src/testcurl/https/test_https_get.c

@@ -46,7 +46,7 @@ test_cipher_option (FILE * test_fd,
 
   int ret;
   struct MHD_Daemon *d;
-  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
+  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_TLS |
                         MHD_USE_DEBUG, 4233,
                         NULL, NULL, &http_ahc, NULL,
                         MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
@@ -75,7 +75,7 @@ test_secure_get (FILE * test_fd,
   int ret;
   struct MHD_Daemon *d;
 
-  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
+  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_TLS |
                         MHD_USE_DEBUG, 4233,
                         NULL, NULL, &http_ahc, NULL,
                         MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,

src/testcurl/https/test_https_get_parallel.c

@@ -151,7 +151,7 @@ main (int argc, char *const *argv)
   errorCount +=
     test_wrap ("single threaded daemon, single client, epoll", &test_single_client,
                NULL,
-               MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL | MHD_USE_DEBUG | MHD_USE_EPOLL,
+               MHD_USE_SELECT_INTERNALLY | MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_EPOLL,
                aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
                srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
                srv_self_signed_cert_pem, MHD_OPTION_END);
@@ -159,7 +159,7 @@ main (int argc, char *const *argv)
   errorCount +=
     test_wrap ("single threaded daemon, single client", &test_single_client,
                NULL,
-               MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL | MHD_USE_DEBUG,
+               MHD_USE_SELECT_INTERNALLY | MHD_USE_TLS | MHD_USE_DEBUG,
                aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
                srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
                srv_self_signed_cert_pem, MHD_OPTION_END);
@@ -167,7 +167,7 @@ main (int argc, char *const *argv)
   errorCount +=
     test_wrap ("single threaded daemon, parallel clients, epoll",
                &test_parallel_clients, NULL,
-               MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL | MHD_USE_DEBUG | MHD_USE_EPOLL,
+               MHD_USE_SELECT_INTERNALLY | MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_EPOLL,
                aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
                srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
                srv_self_signed_cert_pem, MHD_OPTION_END);
@@ -175,7 +175,7 @@ main (int argc, char *const *argv)
   errorCount +=
     test_wrap ("single threaded daemon, parallel clients",
                &test_parallel_clients, NULL,
-               MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL | MHD_USE_DEBUG,
+               MHD_USE_SELECT_INTERNALLY | MHD_USE_TLS | MHD_USE_DEBUG,
                aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
                srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
                srv_self_signed_cert_pem, MHD_OPTION_END);

src/testcurl/https/test_https_get_parallel_threads.c

@@ -170,7 +170,7 @@ main (int argc, char *const *argv)
   errorCount +=
     test_wrap ("multi threaded daemon, single client", &test_single_client,
                NULL,
-               MHD_USE_SSL | MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION,
+               MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION,
                aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
                srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
                srv_self_signed_cert_pem, MHD_OPTION_END);
@@ -178,7 +178,7 @@ main (int argc, char *const *argv)
   errorCount +=
     test_wrap ("multi threaded daemon, parallel client",
                &test_parallel_clients, NULL,
-               MHD_USE_SSL | MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION,
+               MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION,
                aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
                srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
                srv_self_signed_cert_pem, MHD_OPTION_END);

src/testcurl/https/test_https_get_select.c

@@ -100,7 +100,7 @@ testExternalGet (int flags)
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_SSL | flags,
+  d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_TLS | flags,
                         1082, NULL, NULL, &ahc_echo, "GET", 
                         MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
                         MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,

src/testcurl/https/test_https_multi_daemon.c

@@ -50,7 +50,7 @@ test_concurent_daemon_pair (void *cls,
   struct MHD_Daemon *d1;
   struct MHD_Daemon *d2;
 
-  d1 = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
+  d1 = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_TLS |
                          MHD_USE_DEBUG, DEAMON_TEST_PORT,
                          NULL, NULL, &http_ahc, NULL,
                          MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
@@ -63,7 +63,7 @@ test_concurent_daemon_pair (void *cls,
       return -1;
     }
 
-  d2 = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
+  d2 = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_TLS |
                          MHD_USE_DEBUG, DEAMON_TEST_PORT + 1,
                          NULL, NULL, &http_ahc, NULL,
                          MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,

src/testcurl/https/test_https_session_info.c

@@ -107,7 +107,7 @@ test_query_session ()
   gen_test_file_url (url, DEAMON_TEST_PORT);
 
   /* setup test */
-  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
+  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_TLS |
                         MHD_USE_DEBUG, DEAMON_TEST_PORT,
                         NULL, NULL, &query_session_ahc, NULL,
 			MHD_OPTION_HTTPS_PRIORITIES, "NORMAL:+ARCFOUR-128",

src/testcurl/https/test_https_sni.c

@@ -260,7 +260,7 @@ main (int argc, char *const *argv)
     }
   load_keys ("host1", ABS_SRCDIR "/host1.crt", ABS_SRCDIR "/host1.key");
   load_keys ("host2", ABS_SRCDIR "/host2.crt", ABS_SRCDIR "/host2.key");
-  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | MHD_USE_DEBUG,
+  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_TLS | MHD_USE_DEBUG,
                         4233,
                         NULL, NULL,
                         &http_ahc, NULL,

src/testcurl/https/test_https_time_out.c

@@ -116,7 +116,7 @@ main (int argc, char *const *argv)
   gnutls_global_init ();
   gnutls_global_set_log_level (11);
 
-  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
+  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_TLS |
                         MHD_USE_DEBUG, DEAMON_TEST_PORT,
                         NULL, NULL, &http_dummy_ahc, NULL,
                         MHD_OPTION_CONNECTION_TIMEOUT, TIME_OUT,

src/testcurl/https/test_tls_authentication.c

@@ -49,7 +49,7 @@ test_secure_get (void * cls, char *cipher_suite, int proto_version)
   int ret;
   struct MHD_Daemon *d;
 
-  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
+  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_TLS |
                         MHD_USE_DEBUG, DEAMON_TEST_PORT,
                         NULL, NULL, &http_ahc, NULL,
                         MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,

src/testcurl/https/test_tls_extensions.c

@@ -231,7 +231,7 @@ main (int argc, char *const *argv)
       return -1;
     }
 
-  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
+  d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_TLS |
                         MHD_USE_DEBUG, DEAMON_TEST_PORT,
                         NULL, NULL, &http_ahc, NULL,
                         MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,

src/testcurl/https/test_tls_options.c

@@ -83,7 +83,7 @@ main (int argc, char *const *argv)
   unsigned int errorCount = 0;
   const char *ssl_version;
   int daemon_flags =
-    MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | MHD_USE_DEBUG;
+    MHD_USE_THREAD_PER_CONNECTION | MHD_USE_TLS | MHD_USE_DEBUG;
 
   gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
   gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);