diff --git a/README.md b/README.md index 2671b5a30..89def00e6 100644 --- a/README.md +++ b/README.md @@ -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-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 ------------- diff --git a/src/kem/sike/Makefile.am b/src/kem/sike/Makefile.am index 55ddba072..9e72e76a9 100644 --- a/src/kem/sike/Makefile.am +++ b/src/kem/sike/Makefile.am @@ -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 +# FIXMEOQS: enable FAST mode, assembly + if X86 SIKE_FLAGS = -D_GENERIC_ -D_X86_ else if X86_64 -SIKE_FLAGS = -D_AMD64_ +SIKE_FLAGS = -D_GENERIC_ -D_AMD64_ else if ARM SIKE_FLAGS = -D_GENERIC_ -D_ARM_ else if ARM64 -SIKE_FLAGS = -D_ARM64_ +SIKE_FLAGS = -D_GENERIC_ -D_ARM64_ endif # ARM64 endif # ARM endif # X86_64 diff --git a/src/kem/sike/P434/P434.c b/src/kem/sike/P434/P434.c index 7e63cded3..013cc31c8 100644 --- a/src/kem/sike/P434/P434.c +++ b/src/kem/sike/P434/P434.c @@ -114,7 +114,7 @@ static const unsigned int strat_Bob[MAX_Bob - 1] = { #if defined(X86_64) #include "AMD64/fp_x64.c" -#include "AMD64/fp_x64_asm.S" +// #include "AMD64/fp_x64_asm.S" FIXMEOQS #else #include "generic/fp_generic.c" #endif diff --git a/src/kem/sike/P503/P503.c b/src/kem/sike/P503/P503.c index fee876305..fefddd17b 100644 --- a/src/kem/sike/P503/P503.c +++ b/src/kem/sike/P503/P503.c @@ -120,10 +120,10 @@ static const unsigned int strat_Bob[MAX_Bob - 1] = { #if defined(X86_64) #include "AMD64/fp_x64.c" -#include "AMD64/fp_x64_asm.S" +// #include "AMD64/fp_x64_asm.S" FIXMEOQS #elif defined(ARM64) #include "ARM64/fp_arm64.c" -#include "ARM64/fp_arm64_asm.S" +// #include "ARM64/fp_arm64_asm.S" FIXMEOQS #else #include "generic/fp_generic.c" #endif diff --git a/src/kem/sike/P610/P610.c b/src/kem/sike/P610/P610.c index f5b457926..4db568173 100644 --- a/src/kem/sike/P610/P610.c +++ b/src/kem/sike/P610/P610.c @@ -122,7 +122,7 @@ static const unsigned int strat_Bob[MAX_Bob - 1] = { #if defined(X86_64) #include "AMD64/fp_x64.c" -#include "AMD64/fp_x64_asm.S" +// #include "AMD64/fp_x64_asm.S" FIXMEOQS #else #include "generic/fp_generic.c" #endif diff --git a/src/kem/sike/P751/P751.c b/src/kem/sike/P751/P751.c index a1c8f3480..df1501f8c 100644 --- a/src/kem/sike/P751/P751.c +++ b/src/kem/sike/P751/P751.c @@ -124,7 +124,7 @@ static const unsigned int strat_Bob[MAX_Bob - 1] = { #if defined(X86_64) #include "AMD64/fp_x64.c" -#include "AMD64/fp_x64_asm.S" +// #include "AMD64/fp_x64_asm.S" FIXMEOQS #elif defined(ARM64) #include "ARM64/fp_arm64.c" #else