1 files changed, 30 insertions, 36 deletions

diff --git a/src/daemon/https/tls/gnutls_kx.c b/src/daemon/https/tls/gnutls_kx.c
index f1824f03..a4041e39 100644
--- a/src/daemon/https/tls/gnutls_kx.c
+++ b/src/daemon/https/tls/gnutls_kx.c
@@ -65,13 +65,13 @@ generate_normal_master (MHD_gtls_session_t session, int keep_premaster)
                         MHD_gtls_bin2hex (PREMASTER.data, PREMASTER.size, buf,
                                           sizeof (buf)));
   MHD__gnutls_hard_log ("INT: CLIENT RANDOM[%d]: %s\n", 32,
-                        MHD_gtls_bin2hex (session->
-                                          security_parameters.client_random,
-                                          32, buf, sizeof (buf)));
+                        MHD_gtls_bin2hex (session->security_parameters.
+                                          client_random, 32, buf,
+                                          sizeof (buf)));
   MHD__gnutls_hard_log ("INT: SERVER RANDOM[%d]: %s\n", 32,
-                        MHD_gtls_bin2hex (session->
-                                          security_parameters.server_random,
-                                          32, buf, sizeof (buf)));
+                        MHD_gtls_bin2hex (session->security_parameters.
+                                          server_random, 32, buf,
+                                          sizeof (buf)));
 
   if (MHD__gnutls_protocol_get_version (session) == MHD_GNUTLS_PROTOCOL_SSL3)
     {
@@ -86,8 +86,8 @@ generate_normal_master (MHD_gtls_session_t session, int keep_premaster)
         MHD_gnutls_ssl3_generate_random (PREMASTER.data, PREMASTER.size,
                                          rnd, 2 * TLS_RANDOM_SIZE,
                                          TLS_MASTER_SIZE,
-                                         session->
-                                         security_parameters.master_secret);
+                                         session->security_parameters.
+                                         master_secret);
 
     }
   else
@@ -117,9 +117,8 @@ generate_normal_master (MHD_gtls_session_t session, int keep_premaster)
     return ret;
 
   MHD__gnutls_hard_log ("INT: MASTER SECRET: %s\n",
-                        MHD_gtls_bin2hex (session->
-                                          security_parameters.master_secret,
-                                          TLS_MASTER_SIZE, buf,
+                        MHD_gtls_bin2hex (session->security_parameters.
+                                          master_secret, TLS_MASTER_SIZE, buf,
                                           sizeof (buf)));
 
   return ret;
@@ -186,8 +185,8 @@ MHD_gtls_send_server_certificate_request (MHD_gtls_session_t session,
   int data_size = 0;
   int ret = 0;
 
-  if (session->internals.
-      auth_struct->MHD_gtls_gen_server_certificate_request == NULL)
+  if (session->internals.auth_struct->
+      MHD_gtls_gen_server_certificate_request == NULL)
     return 0;
 
   if (session->internals.send_cert_req <= 0)
@@ -199,8 +198,8 @@ MHD_gtls_send_server_certificate_request (MHD_gtls_session_t session,
   if (again == 0)
     {
       data_size =
-        session->internals.
-        auth_struct->MHD_gtls_gen_server_certificate_request (session, &data);
+        session->internals.auth_struct->
+        MHD_gtls_gen_server_certificate_request (session, &data);
 
       if (data_size < 0)
         {
@@ -299,8 +298,8 @@ MHD_gtls_send_client_certificate_verify (MHD_gtls_session_t session,
   if (again == 0)
     {
       data_size =
-        session->internals.
-        auth_struct->MHD_gtls_gen_client_cert_vrfy (session, &data);
+        session->internals.auth_struct->
+        MHD_gtls_gen_client_cert_vrfy (session, &data);
       if (data_size < 0)
         {
           MHD_gnutls_assert ();
@@ -372,8 +371,8 @@ MHD_gtls_recv_server_certificate_request (MHD_gtls_session_t session)
   int datasize;
   int ret = 0;
 
-  if (session->internals.
-      auth_struct->MHD_gtls_process_server_certificate_request != NULL)
+  if (session->internals.auth_struct->
+      MHD_gtls_process_server_certificate_request != NULL)
     {
 
       ret =
@@ -388,10 +387,8 @@ MHD_gtls_recv_server_certificate_request (MHD_gtls_session_t session)
         return 0;               /* ignored */
 
       ret =
-        session->internals.
-        auth_struct->MHD_gtls_process_server_certificate_request (session,
-                                                                  data,
-                                                                  datasize);
+        session->internals.auth_struct->
+        MHD_gtls_process_server_certificate_request (session, data, datasize);
       MHD_gnutls_free (data);
       if (ret < 0)
         return ret;
@@ -462,8 +459,8 @@ MHD_gtls_send_client_certificate (MHD_gtls_session_t session, int again)
           /* TLS 1.0 or SSL 3.0 with a valid certificate
            */
           data_size =
-            session->internals.
-            auth_struct->MHD_gtls_gen_client_certificate (session, &data);
+            session->internals.auth_struct->
+            MHD_gtls_gen_client_certificate (session, &data);
 
           if (data_size < 0)
             {
@@ -523,8 +520,8 @@ MHD_gtls_send_server_certificate (MHD_gtls_session_t session, int again)
   if (again == 0)
     {
       data_size =
-        session->internals.
-        auth_struct->MHD_gtls_gen_server_certificate (session, &data);
+        session->internals.auth_struct->
+        MHD_gtls_gen_server_certificate (session, &data);
 
       if (data_size < 0)
         {
@@ -620,9 +617,8 @@ MHD_gtls_recv_client_certificate (MHD_gtls_session_t session)
           return 0;
         }
       ret =
-        session->internals.
-        auth_struct->MHD_gtls_process_client_certificate (session, data,
-                                                          datasize);
+        session->internals.auth_struct->
+        MHD_gtls_process_client_certificate (session, data, datasize);
 
       MHD_gnutls_free (data);
       if (ret < 0 && ret != GNUTLS_E_NO_CERTIFICATE_FOUND)
@@ -666,9 +662,8 @@ MHD_gtls_recv_server_certificate (MHD_gtls_session_t session)
         }
 
       ret =
-        session->internals.
-        auth_struct->MHD_gtls_process_server_certificate (session, data,
-                                                          datasize);
+        session->internals.auth_struct->
+        MHD_gtls_process_server_certificate (session, data, datasize);
       MHD_gnutls_free (data);
       if (ret < 0)
         {
@@ -719,9 +714,8 @@ MHD_gtls_recv_client_certificate_verify_message (MHD_gtls_session_t session)
         }
 
       ret =
-        session->internals.
-        auth_struct->MHD_gtls_process_client_cert_vrfy (session, data,
-                                                        datasize);
+        session->internals.auth_struct->
+        MHD_gtls_process_client_cert_vrfy (session, data, datasize);
       MHD_gnutls_free (data);
       if (ret < 0)
         return ret;