gnutls_ext_raw_parse: introduced function

That function can be combined with callbacks like
gnutls_handshake_set_hook_function() for applications to
be able to process messages when necessary.

Resolves #382

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

3 files changed, 11 insertions, 10 deletions

diff --git a/lib/tls13/certificate.c b/lib/tls13/certificate.c
index 1d688de0b2..ad05f372c5 100644
--- a/lib/tls13/certificate.c
+++ b/lib/tls13/certificate.c
@@ -29,7 +29,7 @@
 #include "mbuffers.h"
 #include "ext/status_request.h"
 
-static int parse_cert_extension(void *ctx, uint16_t tls_id, const uint8_t *data, int data_size);
+static int parse_cert_extension(void *ctx, unsigned tls_id, const uint8_t *data, unsigned data_size);
 static int parse_cert_list(gnutls_session_t session, uint8_t * data, size_t data_size);
 
 int _gnutls13_recv_certificate(gnutls_session_t session)
@@ -309,7 +309,7 @@ typedef struct crt_cert_ctx_st {
 	unsigned idx;
 } crt_cert_ctx_st;
 
-static int parse_cert_extension(void *_ctx, uint16_t tls_id, const uint8_t *data, int data_size)
+static int parse_cert_extension(void *_ctx, unsigned tls_id, const uint8_t *data, unsigned data_size)
 {
 	crt_cert_ctx_st *ctx = _ctx;
 	gnutls_session_t session = ctx->session;
diff --git a/lib/tls13/certificate_request.c b/lib/tls13/certificate_request.c
index 959603f477..4e7c104afb 100644
--- a/lib/tls13/certificate_request.c
+++ b/lib/tls13/certificate_request.c
@@ -55,10 +55,11 @@ static unsigned is_algo_in_list(gnutls_pk_algorithm_t algo, gnutls_pk_algorithm_
 }
 
 static
-int parse_cert_extension(void *_ctx, uint16_t tls_id, const uint8_t *data, int data_size)
+int parse_cert_extension(void *_ctx, unsigned tls_id, const uint8_t *data, unsigned data_size)
 {
 	crt_req_ctx_st *ctx = _ctx;
 	gnutls_session_t session = ctx->session;
+	unsigned v;
 	int ret;
 
 	/* Decide which certificate to use if the signature algorithms extension
@@ -78,8 +79,8 @@ int parse_cert_extension(void *_ctx, uint16_t tls_id, const uint8_t *data, int d
 		if (data_size < 2)
 			return gnutls_assert_val(GNUTLS_E_TLS_PACKET_DECODING_ERROR);
 
-		ret = _gnutls_read_uint16(data);
-		if (ret != data_size-2)
+		v = _gnutls_read_uint16(data);
+		if (v != data_size-2)
 			return gnutls_assert_val(GNUTLS_E_TLS_PACKET_DECODING_ERROR);
 
 		data += 2;
@@ -111,12 +112,12 @@ int parse_cert_extension(void *_ctx, uint16_t tls_id, const uint8_t *data, int d
 			return gnutls_assert_val(GNUTLS_E_TLS_PACKET_DECODING_ERROR);
 		}
 
-		ret = _gnutls_read_uint16(data);
-		if (ret != data_size-2)
+		v = _gnutls_read_uint16(data);
+		if (v != data_size-2)
 			return gnutls_assert_val(GNUTLS_E_TLS_PACKET_DECODING_ERROR);
 
 		ctx->rdn = data+2;
-		ctx->rdn_size = ret;
+		ctx->rdn_size = v;
 	}
 
 	return 0;
diff --git a/lib/tls13/session_ticket.c b/lib/tls13/session_ticket.c
index 3dbec9260f..d5d62f433f 100644
--- a/lib/tls13/session_ticket.c
+++ b/lib/tls13/session_ticket.c
@@ -27,7 +27,7 @@
 #include "tls13/session_ticket.h"
 #include "auth/cert.h"
 
-static int parse_nst_extension(void *ctx, uint16_t tls_id, const uint8_t *data, int data_size);
+static int parse_nst_extension(void *ctx, unsigned tls_id, const uint8_t *data, unsigned data_size);
 
 int _gnutls13_recv_session_ticket(gnutls_session_t session, gnutls_buffer_st *buf)
 {
@@ -76,7 +76,7 @@ cleanup:
 	return ret;
 }
 
-static int parse_nst_extension(void *ctx, uint16_t tls_id, const uint8_t *data, int data_size)
+static int parse_nst_extension(void *ctx, unsigned tls_id, const uint8_t *data, unsigned data_size)
 {
 	/* ignore all extensions */
 	return 0;