Reverted back to default implementation. Enabling fast assembly mode postponed to different PR.

This commit is contained in:
Christian Paquin 2019-07-25 16:29:36 -04:00
parent e00007da38
commit 24bf38a7a5
6 changed files with 10 additions and 8 deletions

View File

@ -176,7 +176,7 @@ Once the toolchain is installed, you can use the following scripts to build and
scripts/arm-cross-compile.sh scripts/arm-cross-compile.sh
scripts/arm-run-tests-qemu.sh scripts/arm-run-tests-qemu.sh
At present there are still some quirks with our ARM build, including problems with SIKE, Picnic and qTESLA and the known answer tests causing build errors or segmentation faults. See issues #461, #462, and #463. At present there are still some quirks with our ARM build, including problems with Picnic and qTESLA and the known answer tests causing build errors or segmentation faults. See issues #461, #462, and #463.
Documentation Documentation
------------- -------------

View File

@ -3,17 +3,19 @@ noinst_LTLIBRARIES = libkemsike.la
libkemsike_la_SOURCES = kem_sike.c P434/P434.c P503/P503.c P610/P610.c P751/P751.c libkemsike_la_SOURCES = kem_sike.c P434/P434.c P503/P503.c P610/P610.c P751/P751.c
# FIXMEOQS: enable FAST mode, assembly
if X86 if X86
SIKE_FLAGS = -D_GENERIC_ -D_X86_ SIKE_FLAGS = -D_GENERIC_ -D_X86_
else else
if X86_64 if X86_64
SIKE_FLAGS = -D_AMD64_ SIKE_FLAGS = -D_GENERIC_ -D_AMD64_
else else
if ARM if ARM
SIKE_FLAGS = -D_GENERIC_ -D_ARM_ SIKE_FLAGS = -D_GENERIC_ -D_ARM_
else else
if ARM64 if ARM64
SIKE_FLAGS = -D_ARM64_ SIKE_FLAGS = -D_GENERIC_ -D_ARM64_
endif # ARM64 endif # ARM64
endif # ARM endif # ARM
endif # X86_64 endif # X86_64

View File

@ -114,7 +114,7 @@ static const unsigned int strat_Bob[MAX_Bob - 1] = {
#if defined(X86_64) #if defined(X86_64)
#include "AMD64/fp_x64.c" #include "AMD64/fp_x64.c"
#include "AMD64/fp_x64_asm.S" // #include "AMD64/fp_x64_asm.S" FIXMEOQS
#else #else
#include "generic/fp_generic.c" #include "generic/fp_generic.c"
#endif #endif

View File

@ -120,10 +120,10 @@ static const unsigned int strat_Bob[MAX_Bob - 1] = {
#if defined(X86_64) #if defined(X86_64)
#include "AMD64/fp_x64.c" #include "AMD64/fp_x64.c"
#include "AMD64/fp_x64_asm.S" // #include "AMD64/fp_x64_asm.S" FIXMEOQS
#elif defined(ARM64) #elif defined(ARM64)
#include "ARM64/fp_arm64.c" #include "ARM64/fp_arm64.c"
#include "ARM64/fp_arm64_asm.S" // #include "ARM64/fp_arm64_asm.S" FIXMEOQS
#else #else
#include "generic/fp_generic.c" #include "generic/fp_generic.c"
#endif #endif

View File

@ -122,7 +122,7 @@ static const unsigned int strat_Bob[MAX_Bob - 1] = {
#if defined(X86_64) #if defined(X86_64)
#include "AMD64/fp_x64.c" #include "AMD64/fp_x64.c"
#include "AMD64/fp_x64_asm.S" // #include "AMD64/fp_x64_asm.S" FIXMEOQS
#else #else
#include "generic/fp_generic.c" #include "generic/fp_generic.c"
#endif #endif

View File

@ -124,7 +124,7 @@ static const unsigned int strat_Bob[MAX_Bob - 1] = {
#if defined(X86_64) #if defined(X86_64)
#include "AMD64/fp_x64.c" #include "AMD64/fp_x64.c"
#include "AMD64/fp_x64_asm.S" // #include "AMD64/fp_x64_asm.S" FIXMEOQS
#elif defined(ARM64) #elif defined(ARM64)
#include "ARM64/fp_arm64.c" #include "ARM64/fp_arm64.c"
#else #else