diff options
| author | bcook <> | 2017-08-14 05:29:32 +0000 |
|---|---|---|
| committer | bcook <> | 2017-08-14 05:29:32 +0000 |
| commit | 8f0579f75da4b74c2ea6fe1c4f874152f5602fbf (patch) | |
| tree | 982cb4921a950797f1bcdf2ce5912f1d3e9df0c8 /src | |
| parent | 4f6c71143c426cf16d8b5207ac8c2925587a962e (diff) | |
| download | openbsd-8f0579f75da4b74c2ea6fe1c4f874152f5602fbf.tar.gz openbsd-8f0579f75da4b74c2ea6fe1c4f874152f5602fbf.tar.bz2 openbsd-8f0579f75da4b74c2ea6fe1c4f874152f5602fbf.zip | |
fix missing bracket on ARM
ok beck@
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/modes/gcm128.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/libcrypto/modes/gcm128.c b/src/lib/libcrypto/modes/gcm128.c index 0b29d9850d..284053a9e9 100644 --- a/src/lib/libcrypto/modes/gcm128.c +++ b/src/lib/libcrypto/modes/gcm128.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: gcm128.c,v 1.17 2017/08/13 17:46:24 bcook Exp $ */ | 1 | /* $OpenBSD: gcm128.c,v 1.18 2017/08/14 05:29:32 bcook Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2010 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2010 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -7,7 +7,7 @@ | |||
| 7 | * are met: | 7 | * are met: |
| 8 | * | 8 | * |
| 9 | * 1. Redistributions of source code must retain the above copyright | 9 | * 1. Redistributions of source code must retain the above copyright |
| 10 | * notice, this list of conditions and the following disclaimer. | 10 | * notice, this list of conditions and the following disclaimer. |
| 11 | * | 11 | * |
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright |
| 13 | * notice, this list of conditions and the following disclaimer in | 13 | * notice, this list of conditions and the following disclaimer in |
| @@ -305,21 +305,21 @@ static void gcm_init_4bit(u128 Htable[16], u64 H[2]) | |||
| 305 | * ARM assembler expects specific dword order in Htable. | 305 | * ARM assembler expects specific dword order in Htable. |
| 306 | */ | 306 | */ |
| 307 | { | 307 | { |
| 308 | int j; | 308 | int j; |
| 309 | |||
| 310 | #if BYTE_ORDER == LITTLE_ENDIAN | 309 | #if BYTE_ORDER == LITTLE_ENDIAN |
| 311 | for (j=0;j<16;++j) { | 310 | for (j=0;j<16;++j) { |
| 312 | V = Htable[j]; | 311 | V = Htable[j]; |
| 313 | Htable[j].hi = V.lo; | 312 | Htable[j].hi = V.lo; |
| 314 | Htable[j].lo = V.hi; | 313 | Htable[j].lo = V.hi; |
| 315 | } | 314 | } |
| 316 | #else /* BIG_ENDIAN */ | 315 | #else /* BIG_ENDIAN */ |
| 317 | for (j=0;j<16;++j) { | 316 | for (j=0;j<16;++j) { |
| 318 | V = Htable[j]; | 317 | V = Htable[j]; |
| 319 | Htable[j].hi = V.lo<<32|V.lo>>32; | 318 | Htable[j].hi = V.lo<<32|V.lo>>32; |
| 320 | Htable[j].lo = V.hi<<32|V.hi>>32; | 319 | Htable[j].lo = V.hi<<32|V.hi>>32; |
| 321 | } | 320 | } |
| 322 | #endif | 321 | #endif |
| 322 | } | ||
| 323 | #endif | 323 | #endif |
| 324 | } | 324 | } |
| 325 | 325 | ||
| @@ -453,7 +453,7 @@ static void gcm_ghash_4bit(u64 Xi[2],const u128 Htable[16], | |||
| 453 | * [should] give ~50% improvement... One could have PACK()-ed | 453 | * [should] give ~50% improvement... One could have PACK()-ed |
| 454 | * the rem_8bit even here, but the priority is to minimize | 454 | * the rem_8bit even here, but the priority is to minimize |
| 455 | * cache footprint... | 455 | * cache footprint... |
| 456 | */ | 456 | */ |
| 457 | u128 Hshr4[16]; /* Htable shifted right by 4 bits */ | 457 | u128 Hshr4[16]; /* Htable shifted right by 4 bits */ |
| 458 | u8 Hshl4[16]; /* Htable shifted left by 4 bits */ | 458 | u8 Hshl4[16]; /* Htable shifted left by 4 bits */ |
| 459 | static const unsigned short rem_8bit[256] = { | 459 | static const unsigned short rem_8bit[256] = { |
