diff options
| author | Brian Smith <brian@briansmith.org> | 2016-01-18 09:04:05 +0300 |
|---|---|---|
| committer | David Benjamin <davidben@google.com> | 2016-01-22 00:06:02 +0300 |
| commit | d3a4e280db4c963b5ab0afa02f21322b776ce8c0 (patch) | |
| tree | 68694e89110f004c0b9dca1718cc7f97db20f2f1 /crypto/chacha | |
| parent | a646258c141df4e204c270b103eba85491db9cca (diff) | |
Fix trivial -Wcast-qual violations.
Fix casts from const to non-const where dropping the constness is
completely unnecessary. The changes to chacha_vec.c don't result in any
changes to chacha_vec_arm.S.
Change-Id: I2f10081fd0e73ff5db746347c5971f263a5221a6
Reviewed-on: https://boringssl-review.googlesource.com/6923
Reviewed-by: David Benjamin <davidben@google.com>
Diffstat (limited to 'crypto/chacha')
| -rw-r--r-- | crypto/chacha/chacha_vec.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/crypto/chacha/chacha_vec.c b/crypto/chacha/chacha_vec.c index addbaa3d..79ec9412 100644 --- a/crypto/chacha/chacha_vec.c +++ b/crypto/chacha/chacha_vec.c @@ -80,8 +80,8 @@ typedef unsigned vec __attribute__((vector_size(16))); #define VBPI 3 #endif #define ONE (vec) _mm_set_epi32(0, 0, 0, 1) -#define LOAD(m) (vec) _mm_loadu_si128((__m128i *)(m)) -#define LOAD_ALIGNED(m) (vec) _mm_load_si128((__m128i *)(m)) +#define LOAD(m) (vec) _mm_loadu_si128((const __m128i *)(m)) +#define LOAD_ALIGNED(m) (vec) _mm_load_si128((const __m128i *)(m)) #define STORE(m, r) _mm_storeu_si128((__m128i *)(m), (__m128i)(r)) #define ROTV1(x) (vec) _mm_shuffle_epi32((__m128i)x, _MM_SHUFFLE(0, 3, 2, 1)) #define ROTV2(x) (vec) _mm_shuffle_epi32((__m128i)x, _MM_SHUFFLE(1, 0, 3, 2)) @@ -157,7 +157,10 @@ void CRYPTO_chacha_20( const uint8_t nonce[12], uint32_t counter) { - unsigned iters, i, *op=(unsigned *)out, *ip=(unsigned *)in, *kp; + unsigned iters, i; + unsigned *op = (unsigned *)out; + const unsigned *ip = (const unsigned *)in; + const unsigned *kp = (const unsigned *)key; #if defined(__ARM_NEON__) uint32_t np[3]; uint8_t alignment_buffer[16] __attribute__((aligned(16))); @@ -165,18 +168,17 @@ void CRYPTO_chacha_20( vec s0, s1, s2, s3; __attribute__ ((aligned (16))) unsigned chacha_const[] = {0x61707865,0x3320646E,0x79622D32,0x6B206574}; - kp = (unsigned *)key; #if defined(__ARM_NEON__) memcpy(np, nonce, 12); #endif s0 = LOAD_ALIGNED(chacha_const); - s1 = LOAD(&((vec*)kp)[0]); - s2 = LOAD(&((vec*)kp)[1]); + s1 = LOAD(&((const vec*)kp)[0]); + s2 = LOAD(&((const vec*)kp)[1]); s3 = (vec){ counter, - ((uint32_t*)nonce)[0], - ((uint32_t*)nonce)[1], - ((uint32_t*)nonce)[2] + ((const uint32_t*)nonce)[0], + ((const uint32_t*)nonce)[1], + ((const uint32_t*)nonce)[2] }; for (iters = 0; iters < inlen/(BPI*64); iters++) @@ -316,7 +318,7 @@ void CRYPTO_chacha_20( buf[0] = REVV_BE(v0 + s0); for (i=inlen & ~15; i<inlen; i++) - ((char *)op)[i] = ((char *)ip)[i] ^ ((char *)buf)[i]; + ((char *)op)[i] = ((const char *)ip)[i] ^ ((const char *)buf)[i]; } } |