svn commit: r274380 - head/sys/crypto/rijndael

Dag-Erling Smørgrav des at FreeBSD.org
Tue Nov 11 13:37:29 UTC 2014


Author: des
Date: Tue Nov 11 13:37:28 2014
New Revision: 274380
URL: https://svnweb.freebsd.org/changeset/base/274380

Log:
  Fix gcc build: preserve const qualifier when casting input values.
  
  Noticed by:	bz@
  Submitted by:	dim@

Modified:
  head/sys/crypto/rijndael/rijndael-api-fst.c

Modified: head/sys/crypto/rijndael/rijndael-api-fst.c
==============================================================================
--- head/sys/crypto/rijndael/rijndael-api-fst.c	Tue Nov 11 12:56:30 2014	(r274379)
+++ head/sys/crypto/rijndael/rijndael-api-fst.c	Tue Nov 11 13:37:28 2014	(r274380)
@@ -233,10 +233,10 @@ int rijndael_padEncrypt(cipherInstance *
 	case MODE_CBC:
 		iv = cipher->IV;
 		for (i = numBlocks; i > 0; i--) {
-			((u_int32_t*)block)[0] = ((u_int32_t*)input)[0] ^ ((u_int32_t*)iv)[0];
-			((u_int32_t*)block)[1] = ((u_int32_t*)input)[1] ^ ((u_int32_t*)iv)[1];
-			((u_int32_t*)block)[2] = ((u_int32_t*)input)[2] ^ ((u_int32_t*)iv)[2];
-			((u_int32_t*)block)[3] = ((u_int32_t*)input)[3] ^ ((u_int32_t*)iv)[3];
+			((u_int32_t*)block)[0] = ((const u_int32_t*)input)[0] ^ ((u_int32_t*)iv)[0];
+			((u_int32_t*)block)[1] = ((const u_int32_t*)input)[1] ^ ((u_int32_t*)iv)[1];
+			((u_int32_t*)block)[2] = ((const u_int32_t*)input)[2] ^ ((u_int32_t*)iv)[2];
+			((u_int32_t*)block)[3] = ((const u_int32_t*)input)[3] ^ ((u_int32_t*)iv)[3];
 			rijndaelEncrypt(key->rk, key->Nr, block, outBuffer);
 			iv = outBuffer;
 			input += 16;


More information about the svn-src-head mailing list