diff options
-rw-r--r-- | lib/buffers.c | 2 | ||||
-rw-r--r-- | lib/buffers.h | 2 | ||||
-rw-r--r-- | lib/cipher.c | 6 | ||||
-rw-r--r-- | lib/cipher.h | 2 | ||||
-rw-r--r-- | lib/dtls-sw.c | 2 | ||||
-rw-r--r-- | lib/dtls.h | 2 | ||||
-rw-r--r-- | lib/gnutls_int.h | 6 | ||||
-rw-r--r-- | lib/num.c | 4 | ||||
-rw-r--r-- | lib/num.h | 6 | ||||
-rw-r--r-- | lib/record.c | 8 | ||||
-rw-r--r-- | tests/dtls-sliding-window.c | 56 |
11 files changed, 48 insertions, 48 deletions
diff --git a/lib/buffers.c b/lib/buffers.c index 0371ae849a..107a9ca9ca 100644 --- a/lib/buffers.c +++ b/lib/buffers.c @@ -67,7 +67,7 @@ */ void _gnutls_record_buffer_put(gnutls_session_t session, - content_type_t type, uint64 * seq, + content_type_t type, gnutls_uint64 * seq, mbuffer_st * bufel) { diff --git a/lib/buffers.h b/lib/buffers.h index a8f2c5c779..e03c45d40d 100644 --- a/lib/buffers.h +++ b/lib/buffers.h @@ -26,7 +26,7 @@ void _gnutls_record_buffer_put(gnutls_session_t session, - content_type_t type, uint64 * seq, + content_type_t type, gnutls_uint64 * seq, mbuffer_st * bufel); inline static int _gnutls_record_buffer_get_size(gnutls_session_t session) diff --git a/lib/cipher.c b/lib/cipher.c index 800104d9ca..acb6b39623 100644 --- a/lib/cipher.c +++ b/lib/cipher.c @@ -53,7 +53,7 @@ static int ciphertext_to_compressed(gnutls_session_t session, gnutls_datum_t * compressed, uint8_t type, record_parameters_st * params, - uint64 * sequence); + gnutls_uint64 * sequence); inline static int is_write_comp_null(record_parameters_st * record_params) { @@ -151,7 +151,7 @@ _gnutls_decrypt(gnutls_session_t session, gnutls_datum_t * ciphertext, gnutls_datum_t * output, content_type_t type, - record_parameters_st * params, uint64 * sequence) + record_parameters_st * params, gnutls_uint64 * sequence) { int ret; @@ -499,7 +499,7 @@ ciphertext_to_compressed(gnutls_session_t session, gnutls_datum_t * ciphertext, gnutls_datum_t * compressed, uint8_t type, record_parameters_st * params, - uint64 * sequence) + gnutls_uint64 * sequence) { uint8_t tag[MAX_HASH_SIZE]; uint8_t nonce[MAX_CIPHER_BLOCK_SIZE]; diff --git a/lib/cipher.h b/lib/cipher.h index 121dff6794..a1dc80c4fd 100644 --- a/lib/cipher.h +++ b/lib/cipher.h @@ -29,4 +29,4 @@ int _gnutls_encrypt(gnutls_session_t session, int _gnutls_decrypt(gnutls_session_t session, gnutls_datum_t * ciphertext, gnutls_datum_t * output, content_type_t type, record_parameters_st * params, - uint64 * sequence); + gnutls_uint64 * sequence); diff --git a/lib/dtls-sw.c b/lib/dtls-sw.c index 7e9d701d12..00f01e5a5e 100644 --- a/lib/dtls-sw.c +++ b/lib/dtls-sw.c @@ -63,7 +63,7 @@ void _dtls_reset_window(struct record_parameters_st *rp) * packet is detected it returns a negative value (but no sensible error code). * Otherwise zero. */ -int _dtls_record_check(struct record_parameters_st *rp, uint64 * _seq) +int _dtls_record_check(struct record_parameters_st *rp, gnutls_uint64 * _seq) { uint64_t seq_num = 0; diff --git a/lib/dtls.h b/lib/dtls.h index 5603241fb4..8c88874ece 100644 --- a/lib/dtls.h +++ b/lib/dtls.h @@ -30,7 +30,7 @@ #include <constate.h> int _dtls_transmit(gnutls_session_t session); -int _dtls_record_check(struct record_parameters_st *rp, uint64 * _seq); +int _dtls_record_check(struct record_parameters_st *rp, gnutls_uint64 * _seq); void _dtls_reset_hsk_state(gnutls_session_t session); void _dtls_reset_window(struct record_parameters_st *rp); diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h index f8b27612e4..0aff2d28d5 100644 --- a/lib/gnutls_int.h +++ b/lib/gnutls_int.h @@ -88,7 +88,7 @@ typedef int ssize_t; */ typedef struct { unsigned char i[8]; -} uint64; +} gnutls_uint64; #include <gnutls/gnutls.h> #include <gnutls/dtls.h> @@ -346,7 +346,7 @@ typedef struct mbuffer_st { content_type_t type; /* record layer sequence */ - uint64 record_sequence; + gnutls_uint64 record_sequence; /* Filled in by handshake layer on send: * type, epoch, htype, handshake_sequence @@ -597,7 +597,7 @@ struct record_state_st { gnutls_datum_t key; auth_cipher_hd_st cipher_state; comp_hd_st compression_state; - uint64 sequence_number; + gnutls_uint64 sequence_number; }; @@ -32,7 +32,7 @@ * Returns 0 on success, or -1 if the uint64 max limit * has been reached. */ -int _gnutls_uint64pp(uint64 * x) +int _gnutls_uint64pp(gnutls_uint64 * x) { register int i, y = 0; @@ -57,7 +57,7 @@ int _gnutls_uint64pp(uint64 * x) * Returns 0 on success, or -1 if the uint48 max limit * has been reached. */ -int _gnutls_uint48pp(uint64 * x) +int _gnutls_uint48pp(gnutls_uint64 * x) { register int i, y = 0; @@ -28,8 +28,8 @@ #include <minmax.h> #include <byteswap.h> -int _gnutls_uint64pp(uint64 *); -int _gnutls_uint48pp(uint64 *); +int _gnutls_uint64pp(gnutls_uint64 *); +int _gnutls_uint48pp(gnutls_uint64 *); #define UINT64DATA(x) ((x).i) @@ -150,7 +150,7 @@ inline static uint16_t _gnutls_conv_uint16(uint16_t data) #endif } -inline static uint32_t _gnutls_uint64touint32(const uint64 * num) +inline static uint32_t _gnutls_uint64touint32(const gnutls_uint64 * num) { uint32_t ret; diff --git a/lib/record.c b/lib/record.c index 161db622bb..a96bd74b64 100644 --- a/lib/record.c +++ b/lib/record.c @@ -56,7 +56,7 @@ struct tls_record_st { uint16_t header_size; uint8_t version[2]; - uint64 sequence; /* DTLS */ + gnutls_uint64 sequence; /* DTLS */ uint16_t length; uint16_t packet_size; /* header_size + length */ content_type_t type; @@ -378,7 +378,7 @@ copy_record_version(gnutls_session_t session, /* Increments the sequence value */ inline static int -sequence_increment(gnutls_session_t session, uint64 * value) +sequence_increment(gnutls_session_t session, gnutls_uint64 * value) { if (IS_DTLS(session)) { return _gnutls_uint48pp(value); @@ -729,7 +729,7 @@ static int record_add_to_buffers(gnutls_session_t session, struct tls_record_st *recv, content_type_t type, gnutls_handshake_description_t htype, - uint64 * seq, mbuffer_st * bufel) + gnutls_uint64 * seq, mbuffer_st * bufel) { int ret; @@ -1133,7 +1133,7 @@ _gnutls_recv_in_buffers(gnutls_session_t session, content_type_t type, gnutls_handshake_description_t htype, unsigned int ms) { - uint64 *packet_sequence; + gnutls_uint64 *packet_sequence; gnutls_datum_t ciphertext; mbuffer_st *bufel = NULL, *decrypted = NULL; gnutls_datum_t t; diff --git a/tests/dtls-sliding-window.c b/tests/dtls-sliding-window.c index 80be2cf4f0..59efdb1689 100644 --- a/tests/dtls-sliding-window.c +++ b/tests/dtls-sliding-window.c @@ -43,11 +43,11 @@ struct record_parameters_st { typedef struct { unsigned char i[8]; -} uint64; +} gnutls_uint64; #define gnutls_assert_val(x) x void _dtls_reset_window(struct record_parameters_st *rp); -int _dtls_record_check(struct record_parameters_st *rp, uint64 * _seq); +int _dtls_record_check(struct record_parameters_st *rp, gnutls_uint64 * _seq); /* taken from nettle */ #ifdef WORDS_BIGENDIAN @@ -67,7 +67,7 @@ int _dtls_record_check(struct record_parameters_st *rp, uint64 * _seq); #define DTLS_SW_NO_INCLUDES #include "../lib/dtls-sw.c" -static void uint64_set(uint64* t, uint64_t v) +static void uint64_set(gnutls_uint64* t, uint64_t v) { memcpy(t->i, &v, 8); } @@ -85,7 +85,7 @@ static void uint64_set(uint64* t, uint64_t v) static void check_dtls_window_uninit_0(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(0); @@ -98,7 +98,7 @@ static void check_dtls_window_uninit_0(void **glob_state) static void check_dtls_window_uninit_large(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; @@ -110,7 +110,7 @@ static void check_dtls_window_uninit_large(void **glob_state) static void check_dtls_window_uninit_very_large(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; @@ -122,7 +122,7 @@ static void check_dtls_window_uninit_very_large(void **glob_state) static void check_dtls_window_12(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(0); @@ -136,7 +136,7 @@ static void check_dtls_window_12(void **glob_state) static void check_dtls_window_19(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(0); @@ -150,7 +150,7 @@ static void check_dtls_window_19(void **glob_state) static void check_dtls_window_skip1(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; unsigned i; RESET_WINDOW; @@ -166,7 +166,7 @@ static void check_dtls_window_skip1(void **glob_state) static void check_dtls_window_skip3(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; unsigned i; RESET_WINDOW; @@ -182,7 +182,7 @@ static void check_dtls_window_skip3(void **glob_state) static void check_dtls_window_21(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(0); @@ -196,7 +196,7 @@ static void check_dtls_window_21(void **glob_state) static void check_dtls_window_91(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(0); @@ -210,7 +210,7 @@ static void check_dtls_window_91(void **glob_state) static void check_dtls_window_large_21(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(LARGE_INT); @@ -224,7 +224,7 @@ static void check_dtls_window_large_21(void **glob_state) static void check_dtls_window_large_12(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(LARGE_INT); @@ -238,7 +238,7 @@ static void check_dtls_window_large_12(void **glob_state) static void check_dtls_window_large_91(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(LARGE_INT); @@ -252,7 +252,7 @@ static void check_dtls_window_large_91(void **glob_state) static void check_dtls_window_large_19(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(LARGE_INT); @@ -266,7 +266,7 @@ static void check_dtls_window_large_19(void **glob_state) static void check_dtls_window_very_large_12(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(INT_OVER_32_BITS); @@ -280,7 +280,7 @@ static void check_dtls_window_very_large_12(void **glob_state) static void check_dtls_window_very_large_91(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(INT_OVER_32_BITS); @@ -294,7 +294,7 @@ static void check_dtls_window_very_large_91(void **glob_state) static void check_dtls_window_very_large_19(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(INT_OVER_32_BITS); @@ -308,7 +308,7 @@ static void check_dtls_window_very_large_19(void **glob_state) static void check_dtls_window_outside(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(0); @@ -322,7 +322,7 @@ static void check_dtls_window_outside(void **glob_state) static void check_dtls_window_large_outside(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(LARGE_INT); @@ -336,7 +336,7 @@ static void check_dtls_window_large_outside(void **glob_state) static void check_dtls_window_very_large_outside(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(INT_OVER_32_BITS); @@ -350,7 +350,7 @@ static void check_dtls_window_very_large_outside(void **glob_state) static void check_dtls_window_dup1(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(LARGE_INT-1); @@ -372,7 +372,7 @@ static void check_dtls_window_dup1(void **glob_state) static void check_dtls_window_dup2(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(LARGE_INT-1); @@ -394,7 +394,7 @@ static void check_dtls_window_dup2(void **glob_state) static void check_dtls_window_dup3(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(LARGE_INT-1); @@ -422,7 +422,7 @@ static void check_dtls_window_dup3(void **glob_state) static void check_dtls_window_out_of_order(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(LARGE_INT-1); @@ -462,7 +462,7 @@ static void check_dtls_window_out_of_order(void **glob_state) static void check_dtls_window_epoch_higher(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; SET_WINDOW_NEXT(LARGE_INT-1); @@ -478,7 +478,7 @@ static void check_dtls_window_epoch_higher(void **glob_state) static void check_dtls_window_epoch_lower(void **glob_state) { struct record_parameters_st state; - uint64 t; + gnutls_uint64 t; RESET_WINDOW; uint64_set(&t, BSWAP64(0x1000000000000LL)); |