Corrections for big endian machines. Pointed out by Mike Siers <mikes@poliac.com>

4 files changed, 13 insertions, 14 deletions

diff --git a/lib/auth_srp.c b/lib/auth_srp.c
index 0e67f5aad0..a20b460426 100644
--- a/lib/auth_srp.c
+++ b/lib/auth_srp.c
@@ -141,7 +141,7 @@ int gen_srp_server_hello(GNUTLS_STATE state, opaque ** data)
 
 	/* firstly copy the algorithm used to generate the verifier 
 	 */
-	memcpy( data_g, &pwd_algo, 1);
+	data_g[0] = pwd_algo;
 
 	/* copy G (generator) to data */
 
@@ -324,7 +324,7 @@ int proc_srp_server_hello(GNUTLS_STATE state, const opaque * data, int data_size
 	
 	i = 0;
 	DECR_LEN( data_size, 1);
-	memcpy( &pwd_algo, data, 1);
+	pwd_algo = data[0];
 	i++;
 
 	DECR_LEN( data_size, 2);
diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index f2201c045d..54c98ddf30 100644
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -94,8 +94,7 @@ uint16 size;
 	
 	do {
 		DECR_LENGTH_RET( next, 1, 0);
-		memcpy( &type, &data[pos], 1);
-		pos++;
+		type = data[pos++];
 
 		DECR_LENGTH_RET( next, 2, 0);
 		size = READuint16(&data[pos]);
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 288067b544..3b95d78053 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -316,7 +316,7 @@ int _gnutls_read_client_hello(GNUTLS_STATE state, opaque * data,
 	state->security_parameters.timestamp = time(NULL);
 
 	DECR_LEN(len, 1);
-	memcpy(&session_id_len, &data[pos++], 1);
+	session_id_len = data[pos++];
 
 	/* RESUME SESSION 
 	 */
@@ -360,7 +360,7 @@ int _gnutls_read_client_hello(GNUTLS_STATE state, opaque * data,
 	/* Select an appropriate compression method
 	 */
 	DECR_LEN(len, 1);
-	memcpy(&z, &data[pos++], 1);	/* z is the number of compression methods */
+	z = data[pos++]; /* z is the number of compression methods */
 
 	DECR_LEN(len, z);
 	ret = _gnutls_server_select_comp_method(state, &data[pos], z);
@@ -668,7 +668,7 @@ int _gnutls_send_handshake(GNUTLS_STATE state, void *i_data,
 		return GNUTLS_E_MEMORY_ERROR;
 	}
 
-	memcpy(&data[pos++], &type, 1);
+	data[pos++] = (uint8) type;
 	WRITEuint24(i_datasize, &data[pos]);
 	pos += 3;
 
@@ -1157,7 +1157,7 @@ static int _gnutls_read_server_hello(GNUTLS_STATE state, char *data,
 	/* Read session ID
 	 */
 	DECR_LEN(len, 1);
-	memcpy(&session_id_len, &data[pos++], 1);
+	session_id_len = data[pos++];
 
 	if (len < session_id_len) {
 		gnutls_assert();
@@ -1297,10 +1297,10 @@ static int _gnutls_copy_comp_methods(GNUTLS_STATE state,
 		return GNUTLS_E_MEMORY_ERROR;
 	}
 
-	memcpy(&(*ret_data)[pos++], &z, 1);	/* put the number of compression methods */
+	(*ret_data)[pos++] = z; /* put the number of compression methods */
 
 	for (i = 0; i < z; i++) {
-		memcpy(&(*ret_data)[pos++], &compression_methods[i], 1);
+		(*ret_data)[pos++] = compression_methods[i];
 	}
 
 	gnutls_free(compression_methods);
@@ -1381,7 +1381,7 @@ static int _gnutls_send_client_hello(GNUTLS_STATE state, int again)
 
 		/* Copy the Session ID 
 		 */
-		memcpy(&data[pos++], &session_id_len, 1);
+		data[pos++] = session_id_len;
 
 		if (session_id_len > 0) {
 			memcpy(&data[pos], SessionID, session_id_len);
@@ -1521,7 +1521,7 @@ static int _gnutls_send_server_hello(GNUTLS_STATE state, int again)
 		    (uint8) _gnutls_compression_get_num(state->
 							gnutls_internals.
 							compression_method);
-		memcpy(&data[pos++], &comp, 1);
+		data[pos++] = comp;
 
 
 		extdatalen = _gnutls_gen_extensions(state, &extdata);
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index ff84850895..b4acb3a898 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -405,8 +405,8 @@ int gnutls_alert_send( GNUTLS_STATE state, AlertLevel level, AlertDescription de
 	uint8 data[2];
 	int ret;
 	
-	memcpy(&data[0], &level, 1);
-	memcpy(&data[1], &desc, 1);
+	data[0] = (uint8) level;
+	data[1] = (uint8) desc;
 
 #ifdef RECORD_DEBUG
 	_gnutls_log( "Record: Sending Alert[%d|%d] - %s\n", data[0], data[1], _gnutls_alert2str((int)data[1]));