feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix problems when building with Make

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2019-06-12 15:37:01 +02:00
parent f42c94e3bc
commit c826c605a3
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/include.am
View File

@ -281,13 +281,12 @@ endif
if BUILD_POLY1305 if BUILD_POLY1305
if BUILD_ARMASM if BUILD_ARMASM
src_libwolfssl_la_SOURCES += wolfcrypt/src/port/arm/armv8-poly1305.c src_libwolfssl_la_SOURCES += wolfcrypt/src/port/arm/armv8-poly1305.c
else endif
src_libwolfssl_la_SOURCES += wolfcrypt/src/poly1305.c src_libwolfssl_la_SOURCES += wolfcrypt/src/poly1305.c
if BUILD_INTELASM if BUILD_INTELASM
src_libwolfssl_la_SOURCES += wolfcrypt/src/poly1305_asm.S src_libwolfssl_la_SOURCES += wolfcrypt/src/poly1305_asm.S
endif endif
endif endif
endif
if BUILD_RC4 if BUILD_RC4
src_libwolfssl_la_SOURCES += wolfcrypt/src/arc4.c src_libwolfssl_la_SOURCES += wolfcrypt/src/arc4.c

4
wolfcrypt/src/poly1305.c
View File

@ -191,7 +191,7 @@ extern void poly1305_final_avx2(Poly1305* ctx, byte* mac);
#endif #endif
#elif defined(POLY130564) #elif defined(POLY130564)
#ifndef WOLFSSL_ARMASM
static word64 U8TO64(const byte* p) static word64 U8TO64(const byte* p)
{ {
return return
@ -215,7 +215,7 @@ extern void poly1305_final_avx2(Poly1305* ctx, byte* mac);
p[6] = (v >> 48) & 0xff; p[6] = (v >> 48) & 0xff;
p[7] = (v >> 56) & 0xff; p[7] = (v >> 56) & 0xff;
} }
#endif/* WOLFSSL_ARMASM */
#else /* if not 64 bit then use 32 bit */ #else /* if not 64 bit then use 32 bit */
static word32 U8TO32(const byte *p) static word32 U8TO32(const byte *p)