summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/debug.c3
-rw-r--r--lib/gnutls_buffers.c17
-rw-r--r--lib/gnutls_int.h3
-rw-r--r--lib/gnutls_record.c20
-rw-r--r--lib/gnutls_state.c2
-rw-r--r--lib/includes/gnutls/gnutls.h.in2
6 files changed, 3 insertions, 44 deletions
diff --git a/lib/debug.c b/lib/debug.c
index 92b70d9515..f5eb466d53 100644
--- a/lib/debug.c
+++ b/lib/debug.c
@@ -58,9 +58,6 @@ _gnutls_packet2str (content_type_t packet)
return "Handshake";
case GNUTLS_APPLICATION_DATA:
return "Application Data";
- case GNUTLS_INNER_APPLICATION:
- return "Inner Application";
-
default:
return "Unknown Packet";
}
diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index 33c6c6661e..a5b7eedd22 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -95,12 +95,6 @@ _gnutls_record_buffer_put (content_type_t type,
(int) length, (int) type);
break;
- case GNUTLS_INNER_APPLICATION:
- buf = &session->internals.ia_data_buffer;
- _gnutls_buffers_log ("BUF[IA]: Inserted %d bytes of Data(%d)\n",
- (int) length, (int) type);
- break;
-
default:
gnutls_assert ();
return GNUTLS_E_INVALID_REQUEST;
@@ -126,9 +120,6 @@ _gnutls_record_buffer_get_size (content_type_t type, gnutls_session_t session)
case GNUTLS_HANDSHAKE:
return session->internals.handshake_data_buffer.length;
- case GNUTLS_INNER_APPLICATION:
- return session->internals.ia_data_buffer.length;
-
default:
return GNUTLS_E_INVALID_REQUEST;
}
@@ -182,14 +173,6 @@ _gnutls_record_buffer_get (content_type_t type,
(int) length, (int) type);
break;
- case GNUTLS_INNER_APPLICATION:
-
- _gnutls_buffer_pop_data (&session->internals.ia_data_buffer, data,
- &length);
- _gnutls_buffers_log ("BUF[REC][IA]: Read %d bytes of Data(%d)\n",
- (int) length, (int) type);
- break;
-
default:
gnutls_assert ();
return GNUTLS_E_INVALID_REQUEST;
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 56324140ad..2969124664 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -230,7 +230,6 @@ typedef enum extensions_t
GNUTLS_EXTENSION_SRP = 12,
GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS = 13,
GNUTLS_EXTENSION_SESSION_TICKET = 35,
- GNUTLS_EXTENSION_INNER_APPLICATION = 37703,
GNUTLS_EXTENSION_SAFE_RENEGOTIATION = 65281 /* aka: 0xff01 */
} extensions_t;
@@ -245,7 +244,6 @@ typedef enum content_type_t
{
GNUTLS_CHANGE_CIPHER_SPEC = 20, GNUTLS_ALERT,
GNUTLS_HANDSHAKE, GNUTLS_APPLICATION_DATA,
- GNUTLS_INNER_APPLICATION = 24
} content_type_t;
@@ -608,7 +606,6 @@ typedef struct
int handshake_mac_handle_init; /* 1 when the previous union and type were initialized */
gnutls_buffer_st handshake_data_buffer; /* this is a buffer that holds the current handshake message */
- gnutls_buffer_st ia_data_buffer; /* holds inner application data (TLS/IA) */
int resumable:1; /* TRUE or FALSE - if we can resume that session */
handshake_state_t handshake_state; /* holds
* a number which indicates where
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index b59f5955f0..409420867f 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -520,7 +520,6 @@ check_recv_type (content_type_t recv_type)
case GNUTLS_ALERT:
case GNUTLS_HANDSHAKE:
case GNUTLS_APPLICATION_DATA:
- case GNUTLS_INNER_APPLICATION:
return 0;
default:
gnutls_assert ();
@@ -539,8 +538,7 @@ check_buffers (gnutls_session_t session, content_type_t type,
opaque * data, int data_size)
{
if ((type == GNUTLS_APPLICATION_DATA ||
- type == GNUTLS_HANDSHAKE ||
- type == GNUTLS_INNER_APPLICATION)
+ type == GNUTLS_HANDSHAKE)
&& _gnutls_record_buffer_get_size (type, session) > 0)
{
int ret, ret2;
@@ -622,7 +620,7 @@ record_add_to_buffers (gnutls_session_t session,
if ((recv_type == type)
&& (type == GNUTLS_APPLICATION_DATA ||
- type == GNUTLS_HANDSHAKE || type == GNUTLS_INNER_APPLICATION))
+ type == GNUTLS_HANDSHAKE))
{
_gnutls_record_buffer_put (type, session, (void *) data->data, data->size);
}
@@ -731,18 +729,6 @@ record_add_to_buffers (gnutls_session_t session,
return _gnutls_recv_hello_request (session, data->data, data->size);
break;
- case GNUTLS_INNER_APPLICATION:
- /* even if data is unexpected put it into the buffer */
- if ((ret = _gnutls_record_buffer_put (recv_type, session,
- (void *) data->data,
- data->size)) < 0)
- {
- gnutls_assert ();
- return ret;
- }
- gnutls_assert ();
- return GNUTLS_E_UNEXPECTED_PACKET;
- break;
default:
_gnutls_record_log
@@ -1147,7 +1133,7 @@ begin:
*/
if ((record.type == type) &&
(type == GNUTLS_APPLICATION_DATA ||
- type == GNUTLS_HANDSHAKE || type == GNUTLS_INNER_APPLICATION))
+ type == GNUTLS_HANDSHAKE))
{
ret = _gnutls_record_buffer_get (type, session, data, data_size);
diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index e21b8e5258..18c9479d32 100644
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -321,7 +321,6 @@ gnutls_init (gnutls_session_t * session, gnutls_connection_end_t con_end)
_gnutls_buffer_init (&(*session)->internals.application_data_buffer);
_gnutls_buffer_init (&(*session)->internals.handshake_data_buffer);
_gnutls_buffer_init (&(*session)->internals.handshake_hash_buffer);
- _gnutls_buffer_init (&(*session)->internals.ia_data_buffer);
_mbuffer_init (&(*session)->internals.record_send_buffer);
_mbuffer_init (&(*session)->internals.record_recv_buffer);
@@ -456,7 +455,6 @@ gnutls_deinit (gnutls_session_t session)
session->record_parameters[i] = NULL;
}
- _gnutls_buffer_clear (&session->internals.ia_data_buffer);
_gnutls_buffer_clear (&session->internals.handshake_hash_buffer);
_gnutls_buffer_clear (&session->internals.handshake_data_buffer);
_gnutls_buffer_clear (&session->internals.application_data_buffer);
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 5e26fd2549..6363df9341 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -345,8 +345,6 @@ extern "C"
* recognized.
* @GNUTLS_A_UNKNOWN_PSK_IDENTITY: The SRP/PSK username is missing
* or not known.
- * @GNUTLS_A_INNER_APPLICATION_FAILURE: Inner application
- * negotiation failed.
*
* Enumeration of different TLS alerts.
*/
View Lorry Controller Status