Replace uint16 with uint16_t.

22 files changed, 72 insertions, 80 deletions

diff --git a/lib/auth_dh_common.c b/lib/auth_dh_common.c
index e13fbe5379..43e9ffb9d4 100644
--- a/lib/auth_dh_common.c
+++ b/lib/auth_dh_common.c
@@ -57,7 +57,7 @@ _gnutls_proc_dh_common_client_kx (gnutls_session_t session,
 				  opaque * data, size_t _data_size,
 				  mpi_t g, mpi_t p)
 {
-  uint16 n_Y;
+  uint16_t n_Y;
   size_t _n_Y;
   int ret;
   ssize_t data_size = _data_size;
@@ -215,7 +215,7 @@ int
 _gnutls_proc_dh_common_server_kx (gnutls_session_t session,
 				  opaque * data, size_t _data_size, int psk)
 {
-  uint16 n_Y, n_g, n_p;
+  uint16_t n_Y, n_g, n_p;
   size_t _n_Y, _n_g, _n_p;
   uint8_t *data_p;
   uint8_t *data_g;
diff --git a/lib/auth_psk.c b/lib/auth_psk.c
index a35c36df2d..3bb84f3838 100644
--- a/lib/auth_psk.c
+++ b/lib/auth_psk.c
@@ -118,9 +118,9 @@ _gnutls_set_psk_session_key (gnutls_session_t session, gnutls_datum * dh_secret)
     }
 
   /* format of the premaster secret:
-   * (uint16) psk_size
+   * (uint16_t) psk_size
    * psk_size bytes of zeros
-   * (uint16) psk_size
+   * (uint16_t) psk_size
    * the psk
    */
   _gnutls_write_uint16 (dh_secret_size, session->key->key.data);
diff --git a/lib/auth_rsa_export.c b/lib/auth_rsa_export.c
index 490492a687..50712cdedc 100644
--- a/lib/auth_rsa_export.c
+++ b/lib/auth_rsa_export.c
@@ -234,7 +234,7 @@ static int
 proc_rsa_export_server_kx (gnutls_session_t session,
 			   opaque * data, size_t _data_size)
 {
-  uint16 n_m, n_e;
+  uint16_t n_m, n_e;
   size_t _n_m, _n_e;
   uint8_t *data_m;
   uint8_t *data_e;
diff --git a/lib/auth_srp.c b/lib/auth_srp.c
index a850610bc6..b7b699ee3b 100644
--- a/lib/auth_srp.c
+++ b/lib/auth_srp.c
@@ -692,7 +692,7 @@ _gnutls_proc_srp_server_kx (gnutls_session_t session, opaque * data,
 			    size_t _data_size)
 {
   uint8_t n_s;
-  uint16 n_g, n_n, n_b;
+  uint16_t n_g, n_n, n_b;
   size_t _n_s, _n_g, _n_n, _n_b;
   const uint8_t *data_n;
   const uint8_t *data_g;
diff --git a/lib/defines.h b/lib/defines.h
index 2c5635b2cb..c35174220e 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -97,12 +97,4 @@ typedef unsigned int uint32;
 # error "Cannot find a 32 bit integer in your system, sorry."
 #endif
 
-#if SIZEOF_UNSIGNED_INT == 2
-typedef unsigned int uint16;
-#elif SIZEOF_UNSIGNED_SHORT == 2
-typedef unsigned short int uint16;
-#else
-# error "Cannot find a 16 bit integer in your system, sorry."
-#endif
-
 #endif /* defines_h */
diff --git a/lib/ext_max_record.c b/lib/ext_max_record.c
index 05406cb934..00d451e7c6 100644
--- a/lib/ext_max_record.c
+++ b/lib/ext_max_record.c
@@ -105,7 +105,7 @@ int
 _gnutls_max_record_send_params (gnutls_session_t session, opaque * data,
 				size_t data_size)
 {
-  uint16 len;
+  uint16_t len;
   /* this function sends the client extension data (dnsname) */
   if (session->security_parameters.entity == GNUTLS_CLIENT)
     {
@@ -177,7 +177,7 @@ _gnutls_mre_num2record (int num)
  * extensions draft.
  */
 int
-_gnutls_mre_record2num (uint16 record_size)
+_gnutls_mre_record2num (uint16_t record_size)
 {
   switch (record_size)
     {
diff --git a/lib/ext_max_record.h b/lib/ext_max_record.h
index 9f6c396aab..8deef9ace4 100644
--- a/lib/ext_max_record.h
+++ b/lib/ext_max_record.h
@@ -26,7 +26,7 @@
  * extensions draft.
  */
 int _gnutls_mre_num2record (int num);
-int _gnutls_mre_record2num (uint16 record_size);
+int _gnutls_mre_record2num (uint16_t record_size);
 int _gnutls_max_record_recv_params (gnutls_session_t session,
 				    const opaque * data, size_t data_size);
 int _gnutls_max_record_send_params (gnutls_session_t session, opaque * data,
diff --git a/lib/ext_server_name.c b/lib/ext_server_name.c
index 761e4a173e..84945d6eaa 100644
--- a/lib/ext_server_name.c
+++ b/lib/ext_server_name.c
@@ -44,7 +44,7 @@ _gnutls_server_name_recv_params (gnutls_session_t session,
 {
   int i;
   const unsigned char *p;
-  uint16 len, type;
+  uint16_t len, type;
   ssize_t data_size = _data_size;
   int server_names = 0;
 
@@ -127,7 +127,7 @@ int
 _gnutls_server_name_send_params (gnutls_session_t session,
 				 opaque * data, size_t _data_size)
 {
-  uint16 len;
+  uint16_t len;
   opaque *p;
   uint i;
   ssize_t data_size = _data_size;
@@ -141,7 +141,7 @@ _gnutls_server_name_send_params (gnutls_session_t session,
       if (session->security_parameters.extensions.server_names_size == 0)
 	return 0;
 
-      /* uint16 
+      /* uint16_t 
        */
       total_size = 2;
       for (i = 0;
@@ -153,7 +153,7 @@ _gnutls_server_name_send_params (gnutls_session_t session,
 	    session->security_parameters.extensions.server_names[i].
 	    name_length;
 
-	  /* uint8_t + uint16 + size 
+	  /* uint8_t + uint16_t + size 
 	   */
 	  total_size += 1 + 2 + len;
 	}
diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index f3c3b7a906..864b9f9806 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -132,10 +132,10 @@ struct gnutls_cipher_entry
 {
   const char *name;
   gnutls_cipher_algorithm_t id;
-  uint16 blocksize;
-  uint16 keysize;
+  uint16_t blocksize;
+  uint16_t keysize;
   cipher_type_t block;
-  uint16 iv;
+  uint16_t iv;
   int export_flag;		/* 0 non export */
 };
 typedef struct gnutls_cipher_entry gnutls_cipher_entry;
diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
index ca866ca25a..b2420f74d3 100644
--- a/lib/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
@@ -222,7 +222,7 @@ mac_deinit (mac_hd_t td, opaque * res, int ver)
 inline static int
 calc_enc_length (gnutls_session_t session, int data_size,
 		 int hash_size, uint8_t * pad, int random_pad,
-		 cipher_type_t block_algo, uint16 blocksize)
+		 cipher_type_t block_algo, uint16_t blocksize)
 {
   uint8_t rnd;
   int length;
@@ -287,7 +287,7 @@ _gnutls_compressed2ciphertext (gnutls_session_t session,
 			       content_type_t _type, int random_pad)
 {
   uint8_t MAC[MAX_HASH_SIZE];
-  uint16 c_length;
+  uint16_t c_length;
   uint8_t pad;
   int length, ret;
   mac_hd_t td;
@@ -413,11 +413,11 @@ _gnutls_ciphertext2compressed (gnutls_session_t session,
 			       gnutls_datum_t ciphertext, uint8_t type)
 {
   uint8_t MAC[MAX_HASH_SIZE];
-  uint16 c_length;
+  uint16_t c_length;
   uint8_t pad;
   int length;
   mac_hd_t td;
-  uint16 blocksize;
+  uint16_t blocksize;
   int ret, i, pad_failed = 0;
   uint8_t major, minor;
   gnutls_protocol_t ver;
@@ -524,7 +524,7 @@ _gnutls_ciphertext2compressed (gnutls_session_t session,
 
   if (length < 0)
     length = 0;
-  c_length = _gnutls_conv_uint16 ((uint16) length);
+  c_length = _gnutls_conv_uint16 ((uint16_t) length);
 
   /* Pass the type, version, length and compressed through
    * MAC.
diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index 6c644f4177..11c35286dd 100644
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -73,7 +73,7 @@ gnutls_extension_entry _gnutls_extensions[MAX_EXT_SIZE] = {
 /* EXTENSION functions */
 
 ext_recv_func
-_gnutls_ext_func_recv (uint16 type)
+_gnutls_ext_func_recv (uint16_t type)
 {
   ext_recv_func ret = NULL;
   GNUTLS_EXTENSION_LOOP (ret = p->gnutls_ext_func_recv);
@@ -82,7 +82,7 @@ _gnutls_ext_func_recv (uint16 type)
 }
 
 ext_send_func
-_gnutls_ext_func_send (uint16 type)
+_gnutls_ext_func_send (uint16_t type)
 {
   ext_send_func ret = NULL;
   GNUTLS_EXTENSION_LOOP (ret = p->gnutls_ext_func_send);
@@ -91,7 +91,7 @@ _gnutls_ext_func_send (uint16 type)
 }
 
 const char *
-_gnutls_extension_get_name (uint16 type)
+_gnutls_extension_get_name (uint16_t type)
 {
   const char *ret = NULL;
 
@@ -105,7 +105,7 @@ _gnutls_extension_get_name (uint16 type)
  * requested ones. Otherwise it's a fatal error.
  */
 static int
-_gnutls_extension_list_check (gnutls_session_t session, uint16 type)
+_gnutls_extension_list_check (gnutls_session_t session, uint16_t type)
 {
   if (session->security_parameters.entity == GNUTLS_CLIENT)
     {
@@ -127,10 +127,10 @@ _gnutls_parse_extensions (gnutls_session_t session, const opaque * data,
 {
   int next, ret;
   int pos = 0;
-  uint16 type;
+  uint16_t type;
   const opaque *sdata;
   ext_recv_func ext_recv;
-  uint16 size;
+  uint16_t size;
 
 #ifdef DEBUG
   int i;
@@ -196,7 +196,7 @@ _gnutls_parse_extensions (gnutls_session_t session, const opaque * data,
  * extensions are the ones we requested.
  */
 static void
-_gnutls_extension_list_add (gnutls_session_t session, uint16 type)
+_gnutls_extension_list_add (gnutls_session_t session, uint16_t type)
 {
 
   if (session->security_parameters.entity == GNUTLS_CLIENT)
@@ -219,7 +219,7 @@ _gnutls_gen_extensions (gnutls_session_t session, opaque * data,
 			size_t data_size)
 {
   int next, size;
-  uint16 pos = 0;
+  uint16_t pos = 0;
   opaque *sdata;
   int sdata_size;
   ext_send_func ext_send;
diff --git a/lib/gnutls_extensions.h b/lib/gnutls_extensions.h
index de6aeb7e35..41eb9d6ea9 100644
--- a/lib/gnutls_extensions.h
+++ b/lib/gnutls_extensions.h
@@ -24,7 +24,7 @@
 
 #include <gnutls_int.h>
 
-const char *_gnutls_extension_get_name (uint16 type);
+const char *_gnutls_extension_get_name (uint16_t type);
 int _gnutls_parse_extensions (gnutls_session_t, const opaque *, int);
 int _gnutls_gen_extensions (gnutls_session_t session, opaque * data,
 			    size_t data_size);
@@ -32,13 +32,13 @@ int _gnutls_gen_extensions (gnutls_session_t session, opaque * data,
 typedef int (*ext_recv_func) (gnutls_session_t, const opaque *, size_t);	/* recv data */
 typedef int (*ext_send_func) (gnutls_session_t, opaque *, size_t);	/* send data */
 
-ext_send_func _gnutls_ext_func_send (uint16 type);
-ext_recv_func _gnutls_ext_func_recv (uint16 type);
+ext_send_func _gnutls_ext_func_send (uint16_t type);
+ext_recv_func _gnutls_ext_func_recv (uint16_t type);
 
 typedef struct
 {
   const char *name;
-  uint16 type;
+  uint16_t type;
   ext_recv_func gnutls_ext_func_recv;
   ext_send_func gnutls_ext_func_send;
 } gnutls_extension_entry;
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index cdf51ff35f..3f5cfa78c7 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -271,7 +271,7 @@ _gnutls_read_client_hello (gnutls_session_t session, opaque * data,
 {
   uint8_t session_id_len, z;
   int pos = 0, ret;
-  uint16 suite_size;
+  uint16_t suite_size;
   gnutls_protocol_t version;
   int len = datalen;
   opaque rnd[TLS_RANDOM_SIZE], *suite_ptr;
@@ -1042,7 +1042,7 @@ _gnutls_recv_handshake_header (gnutls_session_t session,
 static int
 _gnutls_handshake_hash_add_recvd (gnutls_session_t session,
 				  gnutls_handshake_description_t recv_type,
-				  opaque * header, uint16 header_size,
+				  opaque * header, uint16_t header_size,
 				  opaque * dataptr, uint32 datalen)
 {
   int ret;
@@ -1502,7 +1502,7 @@ _gnutls_copy_ciphersuites (gnutls_session_t session,
 {
   int ret, i;
   cipher_suite_st *cipher_suites;
-  uint16 cipher_num;
+  uint16_t cipher_num;
   int datalen, pos;
 
   ret = _gnutls_supported_ciphersuites_sorted (session, &cipher_suites);
@@ -1536,11 +1536,11 @@ _gnutls_copy_ciphersuites (gnutls_session_t session,
 
   cipher_num = ret;
 
-  cipher_num *= sizeof (uint16);	/* in order to get bytes */
+  cipher_num *= sizeof (uint16_t);	/* in order to get bytes */
 
   datalen = pos = 0;
 
-  datalen += sizeof (uint16) + cipher_num;
+  datalen += sizeof (uint16_t) + cipher_num;
 
   if ((size_t) datalen > ret_data_size)
     {
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 4c1216664b..8651777dff 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -310,8 +310,8 @@ typedef struct
   /* The send size is the one requested by the programmer.
    * The recv size is the one negotiated with the peer.
    */
-  uint16 max_record_send_size;
-  uint16 max_record_recv_size;
+  uint16_t max_record_send_size;
+  uint16_t max_record_recv_size;
   /* holds the negotiated certificate type */
   gnutls_certificate_type_t cert_type;
   gnutls_protocol_t version;	/* moved here */
@@ -488,7 +488,7 @@ typedef struct
    * use _gnutls_dh_get_prime_bits() and gnutls_dh_set_prime_bits() 
    * to access it.
    */
-  uint16 dh_prime_bits;
+  uint16_t dh_prime_bits;
 
   size_t max_handshake_data_buffer_size;
 
@@ -513,7 +513,7 @@ typedef struct
   /* Holds the record size requested by the
    * user.
    */
-  uint16 proposed_record_size;
+  uint16_t proposed_record_size;
 
   /* holds the selected certificate and key.
    * use _gnutls_selected_certs_deinit() and _gnutls_selected_certs_set()
@@ -527,8 +527,8 @@ typedef struct
   /* holds the extensions we sent to the peer
    * (in case of a client)
    */
-  uint16 extensions_sent[MAX_EXT_TYPES];
-  uint16 extensions_sent_size;
+  uint16_t extensions_sent[MAX_EXT_TYPES];
+  uint16_t extensions_sent_size;
 
   /* is 0 if we are to send the whole PGP key, or non zero
    * if the fingerprint is to be sent.
diff --git a/lib/gnutls_num.c b/lib/gnutls_num.c
index 7ad9eb9a4b..54d35a17df 100644
--- a/lib/gnutls_num.c
+++ b/lib/gnutls_num.c
@@ -137,11 +137,11 @@ _gnutls_write_uint32 (uint32 num, opaque * data)
   memcpy (data, &num, sizeof (uint32));
 }
 
-uint16
+uint16_t
 _gnutls_read_uint16 (const opaque * data)
 {
-  uint16 res;
-  memcpy (&res, data, sizeof (uint16));
+  uint16_t res;
+  memcpy (&res, data, sizeof (uint16_t));
 #ifndef WORDS_BIGENDIAN
   res = byteswap16 (res);
 #endif
@@ -149,13 +149,13 @@ _gnutls_read_uint16 (const opaque * data)
 }
 
 void
-_gnutls_write_uint16 (uint16 num, opaque * data)
+_gnutls_write_uint16 (uint16_t num, opaque * data)
 {
 
 #ifndef WORDS_BIGENDIAN
   num = byteswap16 (num);
 #endif
-  memcpy (data, &num, sizeof (uint16));
+  memcpy (data, &num, sizeof (uint16_t));
 }
 
 uint32
@@ -168,8 +168,8 @@ _gnutls_conv_uint32 (uint32 data)
 #endif
 }
 
-uint16
-_gnutls_conv_uint16 (uint16 data)
+uint16_t
+_gnutls_conv_uint16 (uint16_t data)
 {
 #ifndef WORDS_BIGENDIAN
   return byteswap16 (data);
diff --git a/lib/gnutls_num.h b/lib/gnutls_num.h
index 0098bb22e4..90afd64ecf 100644
--- a/lib/gnutls_num.h
+++ b/lib/gnutls_num.h
@@ -26,10 +26,10 @@
 
 #include <minmax.h>
 
-#define rotl32(x,n)   (((x) << ((uint16)(n))) | ((x) >> (32 - (uint16)(n))))
-#define rotr32(x,n)   (((x) >> ((uint16)(n))) | ((x) << (32 - (uint16)(n))))
-#define rotl16(x,n)   (((x) << ((uint16)(n))) | ((x) >> (16 - (uint16)(n))))
-#define rotr16(x,n)   (((x) >> ((uint16)(n))) | ((x) << (16 - (uint16)(n))))
+#define rotl32(x,n)   (((x) << ((uint16_t)(n))) | ((x) >> (32 - (uint16_t)(n))))
+#define rotr32(x,n)   (((x) >> ((uint16_t)(n))) | ((x) << (32 - (uint16_t)(n))))
+#define rotl16(x,n)   (((x) << ((uint16_t)(n))) | ((x) >> (16 - (uint16_t)(n))))
+#define rotr16(x,n)   (((x) >> ((uint16_t)(n))) | ((x) << (16 - (uint16_t)(n))))
 
 #define byteswap16(x)  ((rotl16(x, 8) & 0x00ff) | (rotr16(x, 8) & 0xff00))
 #define byteswap32(x)  ((rotl32(x, 8) & 0x00ff00ffUL) | (rotr32(x, 8) & 0xff00ff00UL))
@@ -37,13 +37,13 @@
 uint32 _gnutls_uint24touint32 (uint24 num);
 uint24 _gnutls_uint32touint24 (uint32 num);
 uint32 _gnutls_read_uint32 (const opaque * data);
-uint16 _gnutls_read_uint16 (const opaque * data);
+uint16_t _gnutls_read_uint16 (const opaque * data);
 uint32 _gnutls_conv_uint32 (uint32 data);
-uint16 _gnutls_conv_uint16 (uint16 data);
+uint16_t _gnutls_conv_uint16 (uint16_t data);
 uint32 _gnutls_read_uint24 (const opaque * data);
 void _gnutls_write_uint24 (uint32 num, opaque * data);
 void _gnutls_write_uint32 (uint32 num, opaque * data);
-void _gnutls_write_uint16 (uint16 num, opaque * data);
+void _gnutls_write_uint16 (uint16_t num, opaque * data);
 uint32 _gnutls_uint64touint32 (const uint64 *);
 
 int _gnutls_uint64pp (uint64 *);
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index cb4d005511..0f34fc629d 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -533,8 +533,8 @@ record_check_headers (gnutls_session_t session,
 		      uint8_t headers[RECORD_HEADER_SIZE], content_type_t type,
 		      gnutls_handshake_description_t htype,
 		      /*output */ content_type_t * recv_type,
-		      opaque version[2], uint16 * length,
-		      uint16 * header_size)
+		      opaque version[2], uint16_t * length,
+		      uint16_t * header_size)
 {
 
   /* Read the first two bytes to determine if this is a 
@@ -805,11 +805,11 @@ _gnutls_recv_int (gnutls_session_t session, content_type_t type,
   opaque version[2];
   uint8_t *headers;
   content_type_t recv_type;
-  uint16 length;
+  uint16_t length;
   uint8_t *ciphertext;
   uint8_t *recv_data;
   int ret, ret2;
-  uint16 header_size;
+  uint16_t header_size;
   int empty_packet = 0;
 
   if (type != GNUTLS_ALERT && (sizeofdata == 0 || data == NULL))
diff --git a/lib/gnutls_v2_compat.c b/lib/gnutls_v2_compat.c
index 38c3b57de5..0cabf1e4e6 100644
--- a/lib/gnutls_v2_compat.c
+++ b/lib/gnutls_v2_compat.c
@@ -92,15 +92,15 @@ int
 _gnutls_read_client_hello_v2 (gnutls_session_t session, opaque * data,
 			      int datalen)
 {
-  uint16 session_id_len = 0;
+  uint16_t session_id_len = 0;
   int pos = 0;
   int ret = 0;
-  uint16 sizeOfSuites;
+  uint16_t sizeOfSuites;
   gnutls_protocol_t version;
   opaque rnd[TLS_RANDOM_SIZE];
   int len = datalen;
   int err;
-  uint16 challenge;
+  uint16_t challenge;
   opaque session_id[TLS_MAX_SESSION_ID_SIZE];
   gnutls_protocol_t ver;
 
@@ -133,7 +133,7 @@ _gnutls_read_client_hello_v2 (gnutls_session_t session, opaque * data,
   pos += 2;
 
 
-  /* Read uint16 cipher_spec_length */
+  /* Read uint16_t cipher_spec_length */
   DECR_LEN (len, 2);
   sizeOfSuites = _gnutls_read_uint16 (&data[pos]);
   pos += 2;
diff --git a/lib/x509/extensions.c b/lib/x509/extensions.c
index 2d9ac2ca68..b7d9bb0c4c 100644
--- a/lib/x509/extensions.c
+++ b/lib/x509/extensions.c
@@ -455,7 +455,7 @@ _gnutls_x509_crt_set_extension (gnutls_x509_crt_t cert,
  * extension.
  */
 int
-_gnutls_x509_ext_extract_keyUsage (uint16 * keyUsage,
+_gnutls_x509_ext_extract_keyUsage (uint16_t * keyUsage,
 				   opaque * extnValue, int extnValueLen)
 {
   ASN1_TYPE ext = ASN1_TYPE_EMPTY;
@@ -596,7 +596,7 @@ _gnutls_x509_ext_gen_basicConstraints (int CA, gnutls_datum_t * der_ext)
  * Use an ORed SEQUENCE of GNUTLS_KEY_* for usage.
  */
 int
-_gnutls_x509_ext_gen_keyUsage (uint16 usage, gnutls_datum_t * der_ext)
+_gnutls_x509_ext_gen_keyUsage (uint16_t usage, gnutls_datum_t * der_ext)
 {
   ASN1_TYPE ext = ASN1_TYPE_EMPTY;
   int result;
diff --git a/lib/x509/extensions.h b/lib/x509/extensions.h
index 13bf0b8177..52435b9138 100644
--- a/lib/x509/extensions.h
+++ b/lib/x509/extensions.h
@@ -30,7 +30,7 @@ int _gnutls_x509_crt_get_extension (gnutls_x509_crt_t cert,
 int _gnutls_x509_crt_get_extension_oid (gnutls_x509_crt_t cert,
 					int indx, void *ret,
 					size_t * ret_size);
-int _gnutls_x509_ext_extract_keyUsage (uint16 * keyUsage,
+int _gnutls_x509_ext_extract_keyUsage (uint16_t * keyUsage,
 				       opaque * extnValue, int extnValueLen);
 int _gnutls_x509_ext_extract_basicConstraints (int *CA, opaque * extnValue,
 					       int extnValueLen);
@@ -40,7 +40,7 @@ int _gnutls_x509_crt_set_extension (gnutls_x509_crt_t cert,
 				    const gnutls_datum_t * ext_data,
 				    unsigned int critical);
 int _gnutls_x509_ext_gen_basicConstraints (int CA, gnutls_datum_t * der_ext);
-int _gnutls_x509_ext_gen_keyUsage (uint16 usage, gnutls_datum_t * der_ext);
+int _gnutls_x509_ext_gen_keyUsage (uint16_t usage, gnutls_datum_t * der_ext);
 int _gnutls_x509_ext_gen_subject_alt_name (gnutls_x509_subject_alt_name_t
 					   type, const char *data_string,
 					   gnutls_datum_t * der_ext);
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index e3fd3d0ca0..6d946052fd 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -1068,7 +1068,7 @@ gnutls_x509_crt_get_key_usage (gnutls_x509_crt_t cert,
 {
   int result;
   gnutls_datum_t keyUsage;
-  uint16 _usage;
+  uint16_t _usage;
 
   if (cert == NULL)
     {
diff --git a/lib/x509/x509_write.c b/lib/x509/x509_write.c
index 2a97cc353a..f8c2bb72f2 100644
--- a/lib/x509/x509_write.c
+++ b/lib/x509/x509_write.c
@@ -355,7 +355,7 @@ gnutls_x509_crt_set_key_usage (gnutls_x509_crt_t crt, unsigned int usage)
 
   /* generate the extension.
    */
-  result = _gnutls_x509_ext_gen_keyUsage ((uint16) usage, &der_data);
+  result = _gnutls_x509_ext_gen_keyUsage ((uint16_t) usage, &der_data);
   if (result < 0)
     {
       gnutls_assert ();