izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocb.cc: Mark local functions as static

Browse Source 
This fixes the broken i386 build (aka generic code).
Untested on __ALTIVEC__ and __ARM_NEON__.

Signed-off-by: John Hood <cgull@glup.org>
This commit is contained in:
John Hood
2015-06-07 15:42:24 -04:00
parent 90965f175f
commit dd58a398de
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/crypto/ocb.cc
+5 -5
View File
@@ -193,7 +193,7 @@
#define unequal_blocks(x,y) vec_any_ne(x,y) #define unequal_blocks(x,y) vec_any_ne(x,y)
#define swap_if_le(b) (b) #define swap_if_le(b) (b)
#if __PPC64__ #if __PPC64__
block gen_offset(uint64_t KtopStr[3], unsigned bot) { static block gen_offset(uint64_t KtopStr[3], unsigned bot) {
union {uint64_t u64[2]; block bl;} rval; union {uint64_t u64[2]; block bl;} rval;
rval.u64[0] = (KtopStr[0] << bot) | (KtopStr[1] >> (64-bot)); rval.u64[0] = (KtopStr[0] << bot) | (KtopStr[1] >> (64-bot));
rval.u64[1] = (KtopStr[1] << bot) | (KtopStr[2] >> (64-bot)); rval.u64[1] = (KtopStr[1] << bot) | (KtopStr[2] >> (64-bot));
@@ -201,7 +201,7 @@
} }
#else #else
/* Special handling: Shifts are mod 32, and no 64-bit types */ /* Special handling: Shifts are mod 32, and no 64-bit types */
block gen_offset(uint64_t KtopStr[3], unsigned bot) { static block gen_offset(uint64_t KtopStr[3], unsigned bot) {
const vector unsigned k32 = {32,32,32,32}; const vector unsigned k32 = {32,32,32,32};
vector unsigned hi = *(vector unsigned *)(KtopStr+0); vector unsigned hi = *(vector unsigned *)(KtopStr+0);
vector unsigned lo = *(vector unsigned *)(KtopStr+2); vector unsigned lo = *(vector unsigned *)(KtopStr+2);
@@ -246,7 +246,7 @@
} }
#define swap_if_le(b) (b) /* Using endian-neutral int8x16_t */ #define swap_if_le(b) (b) /* Using endian-neutral int8x16_t */
/* KtopStr is reg correct by 64 bits, return mem correct */ /* KtopStr is reg correct by 64 bits, return mem correct */
block gen_offset(uint64_t KtopStr[3], unsigned bot) { static block gen_offset(uint64_t KtopStr[3], unsigned bot) {
const union { unsigned x; unsigned char endian; } little = { 1 }; const union { unsigned x; unsigned char endian; } little = { 1 };
const int64x2_t k64 = {-64,-64}; const int64x2_t k64 = {-64,-64};
uint64x2_t hi = *(uint64x2_t *)(KtopStr+0); /* hi = A B */ uint64x2_t hi = *(uint64x2_t *)(KtopStr+0); /* hi = A B */
@@ -286,7 +286,7 @@
} }
/* KtopStr is reg correct by 64 bits, return mem correct */ /* KtopStr is reg correct by 64 bits, return mem correct */
block gen_offset(uint64_t KtopStr[3], unsigned bot) { static block gen_offset(uint64_t KtopStr[3], unsigned bot) {
block rval; block rval;
if (bot != 0) { if (bot != 0) {
rval.l = (KtopStr[0] << bot) | (KtopStr[1] >> (64-bot)); rval.l = (KtopStr[0] << bot) | (KtopStr[1] >> (64-bot));
@@ -1271,7 +1271,7 @@ static void vectors(ae_ctx *ctx, int len)
printf("P=%d,A=%d: ",len,0); pbuf(ct, i, NULL); printf("P=%d,A=%d: ",len,0); pbuf(ct, i, NULL);
} }
void validate() static void validate()
{ {
ALIGN(16) uint8_t pt[1024]; ALIGN(16) uint8_t pt[1024];
ALIGN(16) uint8_t ct[1024]; ALIGN(16) uint8_t ct[1024];