aboutsummaryrefslogtreecommitdiff
path: root/src/daemon/https/tls/gnutls_record.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/daemon/https/tls/gnutls_record.c')
-rw-r--r--src/daemon/https/tls/gnutls_record.c58
1 files changed, 30 insertions, 28 deletions
diff --git a/src/daemon/https/tls/gnutls_record.c b/src/daemon/https/tls/gnutls_record.c
index 9ccdb1e3..80d5f70f 100644
--- a/src/daemon/https/tls/gnutls_record.c
+++ b/src/daemon/https/tls/gnutls_record.c
@@ -109,7 +109,7 @@ MHD_gtls_record_disable_padding (MHD_gtls_session_t session)
109 **/ 109 **/
110void 110void
111MHD__gnutls_transport_set_ptr (MHD_gtls_session_t session, 111MHD__gnutls_transport_set_ptr (MHD_gtls_session_t session,
112 MHD_gnutls_transport_ptr_t ptr) 112 MHD_gnutls_transport_ptr_t ptr)
113{ 113{
114 session->internals.transport_recv_ptr = ptr; 114 session->internals.transport_recv_ptr = ptr;
115 session->internals.transport_send_ptr = ptr; 115 session->internals.transport_send_ptr = ptr;
@@ -128,8 +128,8 @@ MHD__gnutls_transport_set_ptr (MHD_gtls_session_t session,
128 **/ 128 **/
129void 129void
130MHD__gnutls_transport_set_ptr2 (MHD_gtls_session_t session, 130MHD__gnutls_transport_set_ptr2 (MHD_gtls_session_t session,
131 MHD_gnutls_transport_ptr_t recv_ptr, 131 MHD_gnutls_transport_ptr_t recv_ptr,
132 MHD_gnutls_transport_ptr_t send_ptr) 132 MHD_gnutls_transport_ptr_t send_ptr)
133{ 133{
134 session->internals.transport_send_ptr = send_ptr; 134 session->internals.transport_send_ptr = send_ptr;
135 session->internals.transport_recv_ptr = recv_ptr; 135 session->internals.transport_recv_ptr = recv_ptr;
@@ -188,7 +188,7 @@ MHD__gnutls_bye (MHD_gtls_session_t session, MHD_gnutls_close_request_t how)
188 case STATE61: 188 case STATE61:
189 ret = 189 ret =
190 MHD__gnutls_alert_send (session, GNUTLS_AL_WARNING, 190 MHD__gnutls_alert_send (session, GNUTLS_AL_WARNING,
191 GNUTLS_A_CLOSE_NOTIFY); 191 GNUTLS_A_CLOSE_NOTIFY);
192 STATE = STATE61; 192 STATE = STATE61;
193 if (ret < 0) 193 if (ret < 0)
194 { 194 {
@@ -258,7 +258,8 @@ session_is_valid (MHD_gtls_session_t session)
258 */ 258 */
259inline static void 259inline static void
260copy_record_version (MHD_gtls_session_t session, 260copy_record_version (MHD_gtls_session_t session,
261 MHD_gnutls_handshake_description_t htype, opaque version[2]) 261 MHD_gnutls_handshake_description_t htype,
262 opaque version[2])
262{ 263{
263 enum MHD_GNUTLS_Protocol lver; 264 enum MHD_GNUTLS_Protocol lver;
264 265
@@ -331,8 +332,8 @@ MHD_gtls_send_int (MHD_gtls_session_t session,
331 332
332 MHD__gnutls_record_log 333 MHD__gnutls_record_log
333 ("REC[%x]: Sending Packet[%d] %s(%d) with length: %d\n", session, 334 ("REC[%x]: Sending Packet[%d] %s(%d) with length: %d\n", session,
334 (int) MHD_gtls_uint64touint32 (&session->connection_state. 335 (int) MHD_gtls_uint64touint32 (&session->
335 write_sequence_number), 336 connection_state.write_sequence_number),
336 MHD__gnutls_packet2str (type), type, sizeofdata); 337 MHD__gnutls_packet2str (type), type, sizeofdata);
337 338
338 if (sizeofdata > MAX_RECORD_SEND_SIZE) 339 if (sizeofdata > MAX_RECORD_SEND_SIZE)
@@ -424,11 +425,11 @@ MHD_gtls_send_int (MHD_gtls_session_t session,
424 session->internals.record_send_buffer_user_size = 0; 425 session->internals.record_send_buffer_user_size = 0;
425 426
426 MHD__gnutls_record_log ("REC[%x]: Sent Packet[%d] %s(%d) with length: %d\n", 427 MHD__gnutls_record_log ("REC[%x]: Sent Packet[%d] %s(%d) with length: %d\n",
427 session, 428 session,
428 (int) 429 (int)
429 MHD_gtls_uint64touint32 430 MHD_gtls_uint64touint32
430 (&session->connection_state.write_sequence_number), 431 (&session->connection_state.write_sequence_number),
431 MHD__gnutls_packet2str (type), type, cipher_size); 432 MHD__gnutls_packet2str (type), type, cipher_size);
432 433
433 return retval; 434 return retval;
434} 435}
@@ -547,7 +548,7 @@ record_check_headers (MHD_gtls_session_t session,
547 session->internals.v2_hello = *length; 548 session->internals.v2_hello = *length;
548 549
549 MHD__gnutls_record_log ("REC[%x]: V2 packet received. Length: %d\n", 550 MHD__gnutls_record_log ("REC[%x]: V2 packet received. Length: %d\n",
550 session, *length); 551 session, *length);
551 552
552 } 553 }
553 else 554 else
@@ -570,7 +571,8 @@ record_check_headers (MHD_gtls_session_t session,
570 */ 571 */
571inline static int 572inline static int
572record_check_version (MHD_gtls_session_t session, 573record_check_version (MHD_gtls_session_t session,
573 MHD_gnutls_handshake_description_t htype, opaque version[2]) 574 MHD_gnutls_handshake_description_t htype,
575 opaque version[2])
574{ 576{
575 if (htype == GNUTLS_HANDSHAKE_CLIENT_HELLO) 577 if (htype == GNUTLS_HANDSHAKE_CLIENT_HELLO)
576 { 578 {
@@ -595,7 +597,7 @@ record_check_version (MHD_gtls_session_t session,
595 */ 597 */
596 MHD_gnutls_assert (); 598 MHD_gnutls_assert ();
597 MHD__gnutls_record_log ("REC[%x]: INVALID VERSION PACKET: (%d) %d.%d\n", 599 MHD__gnutls_record_log ("REC[%x]: INVALID VERSION PACKET: (%d) %d.%d\n",
598 session, htype, version[0], version[1]); 600 session, htype, version[0], version[1]);
599 601
600 return GNUTLS_E_UNSUPPORTED_VERSION_PACKET; 602 return GNUTLS_E_UNSUPPORTED_VERSION_PACKET;
601 } 603 }
@@ -769,7 +771,8 @@ get_temp_recv_buffer (MHD_gtls_session_t session, MHD_gnutls_datum_t * tmp)
769 */ 771 */
770 session->internals.recv_buffer.data 772 session->internals.recv_buffer.data
771 = 773 =
772 MHD_gnutls_realloc (session->internals.recv_buffer.data, max_record_size); 774 MHD_gnutls_realloc (session->internals.recv_buffer.data,
775 max_record_size);
773 776
774 if (session->internals.recv_buffer.data == NULL) 777 if (session->internals.recv_buffer.data == NULL)
775 { 778 {
@@ -895,15 +898,14 @@ begin:
895 898
896 MHD__gnutls_record_log 899 MHD__gnutls_record_log
897 ("REC[%x]: Expected Packet[%d] %s(%d) with length: %d\n", session, 900 ("REC[%x]: Expected Packet[%d] %s(%d) with length: %d\n", session,
898 (int) MHD_gtls_uint64touint32 (&session->connection_state. 901 (int) MHD_gtls_uint64touint32 (&session->
899 read_sequence_number), 902 connection_state.read_sequence_number),
900 MHD__gnutls_packet2str (type), type, sizeofdata); 903 MHD__gnutls_packet2str (type), type, sizeofdata);
901 MHD__gnutls_record_log ("REC[%x]: Received Packet[%d] %s(%d) with length: %d\n", 904 MHD__gnutls_record_log
902 session, 905 ("REC[%x]: Received Packet[%d] %s(%d) with length: %d\n", session,
903 (int) 906 (int) MHD_gtls_uint64touint32 (&session->
904 MHD_gtls_uint64touint32 (&session->connection_state. 907 connection_state.read_sequence_number),
905 read_sequence_number), 908 MHD__gnutls_packet2str (recv_type), recv_type, length);
906 MHD__gnutls_packet2str (recv_type), recv_type, length);
907 909
908 if (length > MAX_RECV_SIZE) 910 if (length > MAX_RECV_SIZE)
909 { 911 {
@@ -978,8 +980,8 @@ begin:
978 980
979 MHD__gnutls_record_log 981 MHD__gnutls_record_log
980 ("REC[%x]: Decrypted Packet[%d] %s(%d) with length: %d\n", session, 982 ("REC[%x]: Decrypted Packet[%d] %s(%d) with length: %d\n", session,
981 (int) MHD_gtls_uint64touint32 (&session->connection_state. 983 (int) MHD_gtls_uint64touint32 (&session->
982 read_sequence_number), 984 connection_state.read_sequence_number),
983 MHD__gnutls_packet2str (recv_type), recv_type, decrypted_length); 985 MHD__gnutls_packet2str (recv_type), recv_type, decrypted_length);
984 986
985 /* increase sequence number 987 /* increase sequence number
@@ -1082,7 +1084,7 @@ begin:
1082 **/ 1084 **/
1083ssize_t 1085ssize_t
1084MHD__gnutls_record_send (MHD_gtls_session_t session, 1086MHD__gnutls_record_send (MHD_gtls_session_t session,
1085 const void *data, size_t sizeofdata) 1087 const void *data, size_t sizeofdata)
1086{ 1088{
1087 return MHD_gtls_send_int (session, GNUTLS_APPLICATION_DATA, -1, data, 1089 return MHD_gtls_send_int (session, GNUTLS_APPLICATION_DATA, -1, data,
1088 sizeofdata); 1090 sizeofdata);
@@ -1120,7 +1122,7 @@ MHD__gnutls_record_send (MHD_gtls_session_t session,
1120 **/ 1122 **/
1121ssize_t 1123ssize_t
1122MHD__gnutls_record_recv (MHD_gtls_session_t session, void *data, 1124MHD__gnutls_record_recv (MHD_gtls_session_t session, void *data,
1123 size_t sizeofdata) 1125 size_t sizeofdata)
1124{ 1126{
1125 return MHD_gtls_recv_int (session, GNUTLS_APPLICATION_DATA, -1, data, 1127 return MHD_gtls_recv_int (session, GNUTLS_APPLICATION_DATA, -1, data,
1126 sizeofdata); 1128 sizeofdata);