Merge pull request #412 from open-quantum-safe/master-newhope-consistent

Rename NewHope to NewHopeNIST to be consistent with nist-branch

Makefile.am

@@ -37,7 +37,7 @@ if ENABLE_KEM_SIKE
 liboqs_la_LIBADD += src/kem/sike/libkemsike.la
 endif
 if ENABLE_KEM_NEWHOPE
-liboqs_la_LIBADD += src/kem/newhope/libkemnewhope.la
+liboqs_la_LIBADD += src/kem/newhopenist/libkemnewhopenist.la
 endif
 
 installheaderdir=$(includedir)/oqs
@@ -50,7 +50,7 @@ installheader_HEADERS=config.h \
 	src/kem/kem.h \
 	src/kem/bike/kem_bike.h \
 	src/kem/frodokem/kem_frodokem.h \
-	src/kem/newhope/kem_newhope.h \
+	src/kem/newhopenist/kem_newhopenist.h \
 	src/kem/sike/kem_sike.h \
 	src/sig/sig.h \
 	src/sig/picnic/sig_picnic.h \
@@ -83,7 +83,7 @@ links:
 	cp -f src/kem/bike/kem_bike.h include/oqs
 	cp -f src/kem/frodokem/kem_frodokem.h include/oqs
 	cp -f src/kem/sike/kem_sike.h include/oqs
-	cp -f src/kem/newhope/kem_newhope.h include/oqs
+	cp -f src/kem/newhopenist/kem_newhopenist.h include/oqs
 	cp -f src/sig/sig.h include/oqs
 	cp -f src/sig/picnic/sig_picnic.h include/oqs
 	cp -f src/sig/qtesla/sig_qtesla.h include/oqs

VisualStudio/oqs/oqs.vcxproj

@@ -36,7 +36,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\kem\frodokem\kem_frodokem.h" />
-    <ClInclude Include="..\..\src\kem\newhope\kem_newhope.h" />
+    <ClInclude Include="..\..\src\kem\newhopenist\kem_newhopenist.h" />
     <ClInclude Include="..\..\src\kem\kem.h" />
     <ClInclude Include="..\..\src\kem\sike\kem_sike.h" />
     <ClInclude Include="..\..\src\kem\sike\P503\P503_api.h" />
@@ -87,10 +87,10 @@
     <ClCompile Include="..\..\src\kem\frodokem\frodo976_cshake.c" />
     <ClCompile Include="..\..\src\kem\frodokem\kem_frodokem.c" />
     <ClCompile Include="..\..\src\kem\frodokem\util.c" />
-    <ClCompile Include="..\..\src\kem\newhope\kem_newhope.c" />
+    <ClCompile Include="..\..\src\kem\newhopenist\kem_newhopenist.c" />
     <ClCompile Include="..\..\src\kem\kem.c" />
-    <ClCompile Include="..\..\src\kem\newhope\win_newhope1024cca.c" />
+    <ClCompile Include="..\..\src\kem\newhopenist\win_newhope1024cca.c" />
-    <ClCompile Include="..\..\src\kem\newhope\win_newhope512cca.c" />
+    <ClCompile Include="..\..\src\kem\newhopenist\win_newhope512cca.c" />
     <ClCompile Include="..\..\src\kem\sike\kem_sike.c" />
     <ClCompile Include="..\..\src\kem\sike\P503\P503.c" />
     <ClCompile Include="..\..\src\kem\sike\P751\P751.c" />
@@ -243,7 +243,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_X86_;inline=__inline;WITH_LOWMC_128_128_20;WITH_LOWMC_192_192_30;WITH_LOWMC_256_256_38;MUL_M4RI;REDUCED_LINEAR_LAYER;AES_DISABLE_NI;CONSTANT_TIME;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhope</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhopenist</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -261,7 +261,7 @@ copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kem\newhope\kem_newhope.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\newhopenist\kem_newhopenist.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
@@ -276,7 +276,7 @@ copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_X86_;inline=__inline;WITH_LOWMC_128_128_20;WITH_LOWMC_192_192_30;WITH_LOWMC_256_256_38;MUL_M4RI;REDUCED_LINEAR_LAYER;AES_DISABLE_NI;CONSTANT_TIME;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhope</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhopenist</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -295,7 +295,7 @@ copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kem\newhope\kem_newhope.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\newhopenist\kem_newhopenist.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
@@ -310,7 +310,7 @@ copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_AMD64_;inline=__inline;WITH_LOWMC_128_128_20;WITH_LOWMC_192_192_30;WITH_LOWMC_256_256_38;WITH_OPT;WITH_SSE2;WITH_SSE4_1;WITH_AVX2;MUL_M4RI;REDUCED_LINEAR_LAYER;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;CONSTANT_TIME;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhope</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhopenist</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>false</TreatWarningAsError>
     </ClCompile>
@@ -329,7 +329,7 @@ copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kem\newhope\kem_newhope.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\newhopenist\kem_newhopenist.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
@@ -349,7 +349,7 @@ copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_AMD64_;inline=__inline;WITH_LOWMC_128_128_20;WITH_LOWMC_192_192_30;WITH_LOWMC_256_256_38;WITH_OPT;WITH_SSE2;WITH_SSE4_1;WITH_AVX2;MUL_M4RI;REDUCED_LINEAR_LAYER;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;CONSTANT_TIME;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhope</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhopenist</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <TreatWarningAsError>false</TreatWarningAsError>
     </ClCompile>
@@ -370,7 +370,7 @@ copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kem\newhope\kem_newhope.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\newhopenist\kem_newhopenist.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
@@ -390,7 +390,7 @@ copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_X86_;inline=__inline;WITH_LOWMC_128_128_20;WITH_LOWMC_192_192_30;WITH_LOWMC_256_256_38;MUL_M4RI;REDUCED_LINEAR_LAYER;AES_DISABLE_NI;CONSTANT_TIME;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhope</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhopenist</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -410,7 +410,7 @@ copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kem\newhope\kem_newhope.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\newhopenist\kem_newhopenist.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
@@ -427,7 +427,7 @@ copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_X86_;inline=__inline;WITH_LOWMC_128_128_20;WITH_LOWMC_192_192_30;WITH_LOWMC_256_256_38;MUL_M4RI;REDUCED_LINEAR_LAYER;AES_DISABLE_NI;CONSTANT_TIME;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhope</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhopenist</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -448,7 +448,7 @@ copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kem\newhope\kem_newhope.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\newhopenist\kem_newhopenist.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
@@ -465,7 +465,7 @@ copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_AMD64_;inline=__inline;WITH_LOWMC_128_128_20;WITH_LOWMC_192_192_30;WITH_LOWMC_256_256_38;WITH_OPT;WITH_SSE2;WITH_SSE4_1;WITH_AVX2;MUL_M4RI;REDUCED_LINEAR_LAYER;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;CONSTANT_TIME;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhope</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhopenist</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>false</TreatWarningAsError>
     </ClCompile>
@@ -486,7 +486,7 @@ copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kem\newhope\kem_newhope.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\newhopenist\kem_newhopenist.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
@@ -508,7 +508,7 @@ copy "$(SolutionDir)..\src\sig\qtesla\sig_qtesla.h" "$(SolutionDir)include\oqs\"
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_AMD64_;inline=__inline;WITH_LOWMC_128_128_20;WITH_LOWMC_192_192_30;WITH_LOWMC_256_256_38;WITH_OPT;WITH_SSE2;WITH_SSE4_1;WITH_AVX2;MUL_M4RI;REDUCED_LINEAR_LAYER;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;CONSTANT_TIME;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhope</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\src\sig\picnic\external\;$(SolutionDir)..\src\sig\picnic\external\sha3\;$(SolutionDir)..\src\sig\picnic\external\sha3\opt64\;$(SolutionDir)..\src\kem\newhopenist</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <TreatWarningAsError>false</TreatWarningAsError>
     </ClCompile>
@@ -531,7 +531,7 @@ copy "$(SolutionDir)..\src\crypto\sha3\sha3.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\kem.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\bike\kem_bike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\frodokem\kem_frodokem.h" "$(SolutionDir)include\oqs\"
-copy "$(SolutionDir)..\src\kem\newhope\kem_newhope.h" "$(SolutionDir)include\oqs\"
+copy "$(SolutionDir)..\src\kem\newhopenist\kem_newhopenist.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\kem\sike\kem_sike.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\sig.h" "$(SolutionDir)include\oqs\"
 copy "$(SolutionDir)..\src\sig\picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"

VisualStudio/oqs/oqs.vcxproj.filters

@@ -109,17 +109,17 @@
     <ClCompile Include="..\..\src\kem\sike\P751\P751.c">
       <Filter>sike</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kem\newhope\kem_newhope.c">
+    <ClCompile Include="..\..\src\kem\newhopenist\kem_newhopenist.c">
-      <Filter>newhope</Filter>
+      <Filter>newhopenist</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\common\rand_nist.c">
       <Filter>common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kem\newhope\win_newhope512cca.c">
+    <ClCompile Include="..\..\src\kem\newhopenist\win_newhope512cca.c">
-      <Filter>newhope</Filter>
+      <Filter>newhopenist</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kem\newhope\win_newhope1024cca.c">
+    <ClCompile Include="..\..\src\kem\newhopenist\win_newhope1024cca.c">
-      <Filter>newhope</Filter>
+      <Filter>newhopenist</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -227,8 +227,8 @@
     <ClInclude Include="..\..\src\kem\sike\P503\P503_api.h">
       <Filter>sike</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kem\newhope\kem_newhope.h">
+    <ClInclude Include="..\..\src\kem\newhopenist\kem_newhopenist.h">
-      <Filter>newhope</Filter>
+      <Filter>newhopenist</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -256,7 +256,7 @@
     <Filter Include="sike">
       <UniqueIdentifier>{620a9f8e-2013-4cb3-ad37-2ee4348ed893}</UniqueIdentifier>
     </Filter>
-    <Filter Include="newhope">
+    <Filter Include="newhopenist">
       <UniqueIdentifier>{cb72ff2d-77c6-4e60-a04e-6aad5fc6c328}</UniqueIdentifier>
     </Filter>
   </ItemGroup>

VisualStudio/winconfig.h

@@ -10,8 +10,8 @@
 #define OQS_ENABLE_KEM_sike_p751
 #define OQS_ENABLE_KEM_sidh_p503
 #define OQS_ENABLE_KEM_sidh_p751
-#define OQS_ENABLE_KEM_newhope_1024cca
+#define OQS_ENABLE_KEM_newhope_1024_cca_kem
-#define OQS_ENABLE_KEM_newhope_512cca
+#define OQS_ENABLE_KEM_newhope_512_cca_kem
 #define OQS_ENABLE_SIG_picnic_L1_FS
 #define OQS_ENABLE_SIG_picnic_L1_UR
 #define OQS_ENABLE_SIG_picnic_L3_FS

config/features.m4

@@ -45,7 +45,7 @@ AC_DEFUN([CONFIG_FEATURE_FLAGS],
 
   ARG_DISBL_SET_WRAP([kem-frodokem], [kem_frodokem], [ENABLE_KEM_FRODOKEM], [src/kem/frodokem])
   ARG_DISBL_SET_WRAP([kem-sike],  [kem_sike],  [ENABLE_KEM_SIKE],  [src/kem/sike])
-  ARG_DISBL_SET_WRAP([kem-newhope],  [kem_newhope],  [ENABLE_KEM_NEWHOPE],  [src/kem/newhope])
+  ARG_DISBL_SET_WRAP([kem-newhope],  [kem_newhope],  [ENABLE_KEM_NEWHOPE],  [src/kem/newhopenist])
 
   ARG_DISBL_SET_WRAP([sig-picnic], [sig_picnic],
                      [ENABLE_SIG_PICNIC], [src/sig/picnic])
@@ -108,8 +108,8 @@ AC_DEFUN([CONFIG_FEATURES],
   ])
 
   AM_COND_IF([ENABLE_KEM_NEWHOPE], [
-    AC_DEFINE(OQS_ENABLE_KEM_newhope_512cca, 1, "Define to 1 when NewHope-512cca enabled")
+    AC_DEFINE(OQS_ENABLE_KEM_newhope_512_cca_kem, 1, "Define to 1 when NewHope-512-CCA-KEM enabled")
-    AC_DEFINE(OQS_ENABLE_KEM_newhope_1024cca, 1, "Define to 1 when NewHope-1024cca enabled")
+    AC_DEFINE(OQS_ENABLE_KEM_newhope_1024_cca_kem, 1, "Define to 1 when NewHope-1024-CCA-KEM enabled")
   ])
 
 ]

configure.ac

@@ -59,7 +59,7 @@ AC_CONFIG_FILES([Makefile
                  src/kem/bike/Makefile
                  src/kem/frodokem/Makefile
                  src/kem/sike/Makefile
-                 src/kem/newhope/Makefile
+                 src/kem/newhopenist/Makefile
                  tests/Makefile
                  ])
 

docs/algorithms/kem_newhope.md

@@ -1,36 +0,0 @@
-liboqs master branch algorithm datasheet: `kem_newhope`
-========================================================
-
-Summary
--------
-
-- **Name**: NewHope 
-- **Algorithm type**: key encapsulation mechanism
-- **Main cryptographic assumption**: Ring Learning With Errors (RLWE)
-- **Scheme authors**: Thomas Pöppelmann, Erdem Alkim, Roberto Avanzi, Joppe Bos, Léo Ducas, Antonio de la Piedra, Peter Schwabe, Douglas Stebila 
-- **Authors' website**: https://newhopecrypto.org/
-- **Added to liboqs by**: Shravan Mishra 
-
-Parameter sets
---------------
-
-| Parameter set       | Security model | Claimed NIST security level | Public key size (bytes) | Secret key size (bytes) | Ciphertext size (bytes) | Shared secret size (bytes) |
-|---------------------|:--------------:|:---------------------------:|:-----------------------:|:-----------------------:|:-----------------------:|:--------------------------:|
-| NEWHOPE-512CCA      |     IND-CCA    |              1              |           928          |          1888          |           1120          |             32             |
-| NEWHOPE-1024CCA     |     IND-CCA    |              5              |           1824         |          3680          |           2208          |             32             |
-
-Implementation
---------------
-
-- **Source of implementation:** https://newhopecrypto.org/data/NewHope_2017_12_21.zip
-- **License:** 
-- **Language:** C
-- **Constant-time:** Yes 
-- **Architectures supported in liboqs master branch**: x86, x64
-
-Additional comments
--------------------
-
-The original NewHope implementation includes optimizations that are not currently being built in liboqs:
-
-- AVX2

docs/algorithms/kem_newhopenist.md

@@ -0,0 +1,36 @@
+liboqs master branch algorithm datasheet: `kem_newhopenist`
+===========================================================
+
+Summary
+-------
+
+- **Name**: NewHopeNIST
+- **Algorithm type**: key encapsulation mechanism
+- **Main cryptographic assumption**: Ring Learning With Errors (RLWE)
+- **Scheme authors**: Thomas Pöppelmann, Erdem Alkim, Roberto Avanzi, Joppe Bos, Léo Ducas, Antonio de la Piedra, Peter Schwabe, Douglas Stebila
+- **Authors' website**: https://newhopecrypto.org/
+- **Added to liboqs by**: Shravan Mishra
+
+Parameter sets
+--------------
+
+| Parameter set        | Security model | Claimed NIST security level | Public key size (bytes) | Secret key size (bytes) | Ciphertext size (bytes) | Shared secret size (bytes) |
+|----------------------|:--------------:|:---------------------------:|:-----------------------:|:-----------------------:|:-----------------------:|:--------------------------:|
+| NewHope-512-CCA-KEM  |     IND-CCA    |              1              |           928           |          1888           |           1120          |             32             |
+| NewHope-1024-CCA-KEM |     IND-CCA    |              5              |          1824           |          3680           |           2208          |             32             |
+
+Implementation
+--------------
+
+- **Source of implementation:** https://newhopecrypto.org/data/NewHope_2017_12_21.zip
+- **License:**
+- **Language:** C
+- **Constant-time:** Yes
+- **Architectures supported in liboqs master branch**: x86, x64
+
+Additional comments
+-------------------
+
+The original NewHope implementation includes optimizations that are not currently being built in liboqs:
+
+- AVX2

src/kem/kem.c

@@ -17,7 +17,7 @@ OQS_API const char *OQS_KEM_alg_identifier(size_t i) {
 	    OQS_KEM_alg_bike1_l1, OQS_KEM_alg_bike1_l3, OQS_KEM_alg_bike1_l5,
 	    OQS_KEM_alg_bike2_l1, OQS_KEM_alg_bike2_l3, OQS_KEM_alg_bike2_l5,
 	    OQS_KEM_alg_bike3_l1, OQS_KEM_alg_bike3_l3, OQS_KEM_alg_bike3_l5,
-	    OQS_KEM_alg_newhope_512cca, OQS_KEM_alg_newhope_1024cca};
+	    OQS_KEM_alg_newhope_512_cca_kem, OQS_KEM_alg_newhope_1024_cca_kem};
 	if (i >= OQS_KEM_algs_length) {
 		return NULL;
 	} else {
@@ -130,15 +130,15 @@ OQS_API OQS_KEM *OQS_KEM_new(const char *method_name) {
 #else
 		return NULL;
 #endif
-	} else if (0 == strcasecmp(method_name, OQS_KEM_alg_newhope_512cca)) {
+	} else if (0 == strcasecmp(method_name, OQS_KEM_alg_newhope_512_cca_kem)) {
-#ifdef OQS_ENABLE_KEM_newhope_512cca
+#ifdef OQS_ENABLE_KEM_newhope_512_cca_kem
-		return OQS_KEM_newhope_512cca_new();
+		return OQS_KEM_newhope_512_cca_kem_new();
 #else
 		return NULL;
 #endif
-	} else if (0 == strcasecmp(method_name, OQS_KEM_alg_newhope_1024cca)) {
+	} else if (0 == strcasecmp(method_name, OQS_KEM_alg_newhope_1024_cca_kem)) {
-#ifdef OQS_ENABLE_KEM_newhope_1024cca
+#ifdef OQS_ENABLE_KEM_newhope_1024_cca_kem
-		return OQS_KEM_newhope_1024cca_new();
+		return OQS_KEM_newhope_1024_cca_kem_new();
 #else
 		return NULL;
 #endif

src/kem/kem.h

@@ -61,10 +61,10 @@
 #define OQS_KEM_alg_bike3_l3 "BIKE3-L3"
 /** Algorithm identifier for BIKE1-L1 KEM. */
 #define OQS_KEM_alg_bike3_l5 "BIKE3-L5"
-/** Algorithm identifier for NEWHOPE_512CCA KEM. */
+/** Algorithm identifier for NewHope-512-CCA-KEM KEM. */
-#define OQS_KEM_alg_newhope_512cca "NEWHOPE-512CCA"
+#define OQS_KEM_alg_newhope_512_cca_kem "NewHope-512-CCA-KEM"
-/** Algorithm identifier for NEWHOPE_1024CCA KEM. */
+/** Algorithm identifier for NewHope-1024-CCA-KEM KEM. */
-#define OQS_KEM_alg_newhope_1024cca "NEWHOPE-1024CCA"
+#define OQS_KEM_alg_newhope_1024_cca_kem "NewHope-1024-CCA-KEM"
 // EDIT-WHEN-ADDING-KEM
 /** Number of algorithm identifiers above. */
 #define OQS_KEM_algs_length 20
@@ -216,7 +216,7 @@ OQS_API void OQS_KEM_free(OQS_KEM *kem);
 #include <oqs/kem_bike.h>
 #include <oqs/kem_frodokem.h>
 #include <oqs/kem_sike.h>
-#include <oqs/kem_newhope.h>
+#include <oqs/kem_newhopenist.h>
 // EDIT-WHEN-ADDING-KEM
 
 #endif // __OQS_KEM_H

src/kem/newhope/Makefile.am

@@ -1,24 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-noinst_LTLIBRARIES  = libkemnewhope.la 
-noinst_LTLIBRARIES += libkemnewhope_512cca.la libkemnewhope_1024cca.la
-
-libkemnewhope_la_LIBADD = libkemnewhope_512cca.la libkemnewhope_1024cca.la
-libkemnewhope_la_SOURCES = kem_newhope.c
-
-COMMON_FLAGS = $(AM_CFLAGS) -include functions_renaming.h
-libkemnewhope_la_CFLAGS = $(COMMON_FLAGS)
-
-NEWHOPE_SRC_DIR = optimized
-
-NEWHOPE_CSRCS = $(NEWHOPE_SRC_DIR)/cpapke.c $(NEWHOPE_SRC_DIR)/kem.c $(NEWHOPE_SRC_DIR)/ntt.c
-NEWHOPE_CSRCS += $(NEWHOPE_SRC_DIR)/poly.c $(NEWHOPE_SRC_DIR)/precomp.c $(NEWHOPE_SRC_DIR)/reduce.c
-NEWHOPE_CSRCS += $(NEWHOPE_SRC_DIR)/verify.c
-
-libkemnewhope_512cca_la_SOURCES = $(NEWHOPE_CSRCS) 
-libkemnewhope_1024cca_la_SOURCES = $(NEWHOPE_CSRCS)
-
-libkemnewhope_512cca_la_CFLAGS = $(COMMON_FLAGS) -DNEWHOPE_N=512 -DFUNC_PREFIX=OQS_KEM_newhope_512cca
-libkemnewhope_1024cca_la_CFLAGS = $(COMMON_FLAGS) -DNEWHOPE_N=1024 -DFUNC_PREFIX=OQS_KEM_newhope_1024cca
-
-
-

src/kem/newhope/kem_newhope.c

@@ -1,57 +0,0 @@
-#include <stdlib.h>
-
-#include <oqs/kem_newhope.h>
-
-#ifdef OQS_ENABLE_KEM_newhope_512cca
-
-OQS_KEM *OQS_KEM_newhope_512cca_new() {
-
-	OQS_KEM *kem = malloc(sizeof(OQS_KEM));
-	if (kem == NULL) {
-		return NULL;
-	}
-	kem->method_name = OQS_KEM_alg_newhope_512cca;
-
-	kem->claimed_nist_level = 1;
-	kem->ind_cca = true;
-
-	kem->length_public_key = OQS_KEM_newhope_512cca_length_public_key;
-	kem->length_secret_key = OQS_KEM_newhope_512cca_length_secret_key;
-	kem->length_ciphertext = OQS_KEM_newhope_512cca_length_ciphertext;
-	kem->length_shared_secret = OQS_KEM_newhope_512cca_length_shared_secret;
-
-	kem->keypair = OQS_KEM_newhope_512cca_keypair;
-	kem->encaps = OQS_KEM_newhope_512cca_encaps;
-	kem->decaps = OQS_KEM_newhope_512cca_decaps;
-
-	return kem;
-}
-
-#endif
-
-#ifdef OQS_ENABLE_KEM_newhope_1024cca
-
-OQS_KEM *OQS_KEM_newhope_1024cca_new() {
-
-	OQS_KEM *kem = malloc(sizeof(OQS_KEM));
-	if (kem == NULL) {
-		return NULL;
-	}
-	kem->method_name = OQS_KEM_alg_newhope_1024cca;
-
-	kem->claimed_nist_level = 5;
-	kem->ind_cca = true;
-
-	kem->length_public_key = OQS_KEM_newhope_1024cca_length_public_key;
-	kem->length_secret_key = OQS_KEM_newhope_1024cca_length_secret_key;
-	kem->length_ciphertext = OQS_KEM_newhope_1024cca_length_ciphertext;
-	kem->length_shared_secret = OQS_KEM_newhope_1024cca_length_shared_secret;
-
-	kem->keypair = OQS_KEM_newhope_1024cca_keypair;
-	kem->encaps = OQS_KEM_newhope_1024cca_encaps;
-	kem->decaps = OQS_KEM_newhope_1024cca_decaps;
-
-	return kem;
-}
-
-#endif

src/kem/newhope/kem_newhope.h

@@ -1,44 +0,0 @@
-#ifndef __OQS_KEM_NEWHOPE_H
-#define __OQS_KEM_NEWHOPE_H
-
-#include <oqs/oqs.h>
-
-#ifdef OQS_ENABLE_KEM_newhope_512cca
-
-#define OQS_KEM_newhope_512cca_length_secret_key 1888
-#define OQS_KEM_newhope_512cca_length_public_key 928
-#define OQS_KEM_newhope_512cca_length_ciphertext 1120
-#define OQS_KEM_newhope_512cca_length_shared_secret 32
-
-OQS_KEM *OQS_KEM_newhope_512cca_new();
-
-OQS_STATUS OQS_KEM_newhope_512cca_keypair(uint8_t *public_key,
-                                          uint8_t *secret_key);
-OQS_STATUS OQS_KEM_newhope_512cca_encaps(uint8_t *ciphertext,
-                                         uint8_t *shared_secret,
-                                         const uint8_t *public_key);
-OQS_STATUS OQS_KEM_newhope_512cca_decaps(uint8_t *shared_secret,
-                                         const unsigned char *ciphertext,
-                                         const uint8_t *secret_key);
-#endif
-
-#ifdef OQS_ENABLE_KEM_newhope_1024cca
-
-#define OQS_KEM_newhope_1024cca_length_secret_key 3680
-#define OQS_KEM_newhope_1024cca_length_public_key 1824
-#define OQS_KEM_newhope_1024cca_length_ciphertext 2208
-#define OQS_KEM_newhope_1024cca_length_shared_secret 32
-
-OQS_KEM *OQS_KEM_newhope_1024cca_new();
-
-OQS_STATUS OQS_KEM_newhope_1024cca_keypair(uint8_t *public_key,
-                                           uint8_t *secret_key);
-OQS_STATUS OQS_KEM_newhope_1024cca_encaps(uint8_t *ciphertext,
-                                          uint8_t *shared_secret,
-                                          const uint8_t *public_key);
-OQS_STATUS OQS_KEM_newhope_1024cca_decaps(uint8_t *shared_secret,
-                                          const unsigned char *ciphertext,
-                                          const uint8_t *secret_key);
-#endif
-
-#endif

src/kem/newhopenist/Makefile.am

@@ -0,0 +1,21 @@
+AUTOMAKE_OPTIONS = foreign
+noinst_LTLIBRARIES  = libkemnewhopenist.la
+noinst_LTLIBRARIES += libkemnewhopenist_512_cca.la libkemnewhopenist_1024_cca.la
+
+libkemnewhopenist_la_LIBADD = libkemnewhopenist_512_cca.la libkemnewhopenist_1024_cca.la
+libkemnewhopenist_la_SOURCES = kem_newhopenist.c
+
+COMMON_FLAGS = $(AM_CFLAGS) -include functions_renaming.h
+libkemnewhopenist_la_CFLAGS = $(COMMON_FLAGS)
+
+NEWHOPE_SRC_DIR = optimized
+
+NEWHOPE_CSRCS = $(NEWHOPE_SRC_DIR)/cpapke.c $(NEWHOPE_SRC_DIR)/kem.c $(NEWHOPE_SRC_DIR)/ntt.c
+NEWHOPE_CSRCS += $(NEWHOPE_SRC_DIR)/poly.c $(NEWHOPE_SRC_DIR)/precomp.c $(NEWHOPE_SRC_DIR)/reduce.c
+NEWHOPE_CSRCS += $(NEWHOPE_SRC_DIR)/verify.c
+
+libkemnewhopenist_512_cca_la_SOURCES = $(NEWHOPE_CSRCS)
+libkemnewhopenist_1024_cca_la_SOURCES = $(NEWHOPE_CSRCS)
+
+libkemnewhopenist_512_cca_la_CFLAGS = $(COMMON_FLAGS) -DNEWHOPE_N=512 -DFUNC_PREFIX=OQS_KEM_newhope_512_cca_kem
+libkemnewhopenist_1024_cca_la_CFLAGS = $(COMMON_FLAGS) -DNEWHOPE_N=1024 -DFUNC_PREFIX=OQS_KEM_newhope_1024_cca_kem

src/kem/newhopenist/kem_newhopenist.c

@@ -0,0 +1,57 @@
+#include <stdlib.h>
+
+#include <oqs/kem_newhopenist.h>
+
+#ifdef OQS_ENABLE_KEM_newhope_512_cca_kem
+
+OQS_KEM *OQS_KEM_newhope_512_cca_kem_new() {
+
+	OQS_KEM *kem = malloc(sizeof(OQS_KEM));
+	if (kem == NULL) {
+		return NULL;
+	}
+	kem->method_name = OQS_KEM_alg_newhope_512_cca_kem;
+
+	kem->claimed_nist_level = 1;
+	kem->ind_cca = true;
+
+	kem->length_public_key = OQS_KEM_newhope_512_cca_kem_length_public_key;
+	kem->length_secret_key = OQS_KEM_newhope_512_cca_kem_length_secret_key;
+	kem->length_ciphertext = OQS_KEM_newhope_512_cca_kem_length_ciphertext;
+	kem->length_shared_secret = OQS_KEM_newhope_512_cca_kem_length_shared_secret;
+
+	kem->keypair = OQS_KEM_newhope_512_cca_kem_keypair;
+	kem->encaps = OQS_KEM_newhope_512_cca_kem_encaps;
+	kem->decaps = OQS_KEM_newhope_512_cca_kem_decaps;
+
+	return kem;
+}
+
+#endif
+
+#ifdef OQS_ENABLE_KEM_newhope_1024_cca_kem
+
+OQS_KEM *OQS_KEM_newhope_1024_cca_kem_new() {
+
+	OQS_KEM *kem = malloc(sizeof(OQS_KEM));
+	if (kem == NULL) {
+		return NULL;
+	}
+	kem->method_name = OQS_KEM_alg_newhope_1024_cca_kem;
+
+	kem->claimed_nist_level = 5;
+	kem->ind_cca = true;
+
+	kem->length_public_key = OQS_KEM_newhope_1024_cca_kem_length_public_key;
+	kem->length_secret_key = OQS_KEM_newhope_1024_cca_kem_length_secret_key;
+	kem->length_ciphertext = OQS_KEM_newhope_1024_cca_kem_length_ciphertext;
+	kem->length_shared_secret = OQS_KEM_newhope_1024_cca_kem_length_shared_secret;
+
+	kem->keypair = OQS_KEM_newhope_1024_cca_kem_keypair;
+	kem->encaps = OQS_KEM_newhope_1024_cca_kem_encaps;
+	kem->decaps = OQS_KEM_newhope_1024_cca_kem_decaps;
+
+	return kem;
+}
+
+#endif

src/kem/newhopenist/kem_newhopenist.h

@@ -0,0 +1,44 @@
+#ifndef __OQS_KEM_NEWHOPENIST_H
+#define __OQS_KEM_NEWHOPENIST_H
+
+#include <oqs/oqs.h>
+
+#ifdef OQS_ENABLE_KEM_newhope_512_cca_kem
+
+#define OQS_KEM_newhope_512_cca_kem_length_secret_key 1888
+#define OQS_KEM_newhope_512_cca_kem_length_public_key 928
+#define OQS_KEM_newhope_512_cca_kem_length_ciphertext 1120
+#define OQS_KEM_newhope_512_cca_kem_length_shared_secret 32
+
+OQS_KEM *OQS_KEM_newhope_512_cca_kem_new();
+
+OQS_STATUS OQS_KEM_newhope_512_cca_kem_keypair(uint8_t *public_key,
+                                               uint8_t *secret_key);
+OQS_STATUS OQS_KEM_newhope_512_cca_kem_encaps(uint8_t *ciphertext,
+                                              uint8_t *shared_secret,
+                                              const uint8_t *public_key);
+OQS_STATUS OQS_KEM_newhope_512_cca_kem_decaps(uint8_t *shared_secret,
+                                              const unsigned char *ciphertext,
+                                              const uint8_t *secret_key);
+#endif
+
+#ifdef OQS_ENABLE_KEM_newhope_1024_cca_kem
+
+#define OQS_KEM_newhope_1024_cca_kem_length_secret_key 3680
+#define OQS_KEM_newhope_1024_cca_kem_length_public_key 1824
+#define OQS_KEM_newhope_1024_cca_kem_length_ciphertext 2208
+#define OQS_KEM_newhope_1024_cca_kem_length_shared_secret 32
+
+OQS_KEM *OQS_KEM_newhope_1024_cca_kem_new();
+
+OQS_STATUS OQS_KEM_newhope_1024_cca_kem_keypair(uint8_t *public_key,
+                                                uint8_t *secret_key);
+OQS_STATUS OQS_KEM_newhope_1024_cca_kem_encaps(uint8_t *ciphertext,
+                                               uint8_t *shared_secret,
+                                               const uint8_t *public_key);
+OQS_STATUS OQS_KEM_newhope_1024_cca_kem_decaps(uint8_t *shared_secret,
+                                               const unsigned char *ciphertext,
+                                               const uint8_t *secret_key);
+#endif
+
+#endif

src/kem/newhopenist/optimized/api.h

@@ -9,9 +9,9 @@
 #define CRYPTO_BYTES NEWHOPE_SYMBYTES
 
 #if (NEWHOPE_N == 512)
-#define CRYPTO_ALGNAME "NewHope512-CCAKEM"
+#define CRYPTO_ALGNAME "NewHope-512-CCA-KEM"
 #elif (NEWHOPE_N == 1024)
-#define CRYPTO_ALGNAME "NewHope1024-CCAKEM"
+#define CRYPTO_ALGNAME "NewHope-1024-CCA-KEM"
 #else
 #error "NEWHOPE_N must be either 512 or 1024"
 #endif

src/kem/newhopenist/win_newhope1024cca.c

@@ -1,7 +1,7 @@
-/* newhope 512cca compilation file for Windows */
+/* NewHope-1024-CCA-KEM compilation file for Windows */
 
 #define NEWHOPE_N 1024
-#define FUNC_PREFIX OQS_KEM_newhope_1024cca
+#define FUNC_PREFIX OQS_KEM_newhope_1024_cca_kem
 
 #include "functions_renaming.h"
 #include "optimized\cpapke.c"
@@ -10,4 +10,4 @@
 #include "optimized\poly.c"
 #include "optimized\precomp.c"
 #include "optimized\reduce.c"
-#include "optimized\verify.c"
+#include "optimized\verify.c"

src/kem/newhopenist/win_newhope512cca.c

@@ -1,7 +1,7 @@
-/* newhope 512cca compilation file for Windows */
+/* NewHope-512-CCA-KEM compilation file for Windows */
 
 #define NEWHOPE_N 512
-#define FUNC_PREFIX OQS_KEM_newhope_512cca
+#define FUNC_PREFIX OQS_KEM_newhope_512_cca_kem
 
 #include "functions_renaming.h"
 #include "optimized\cpapke.c"
@@ -10,4 +10,4 @@
 #include "optimized\poly.c"
 #include "optimized\precomp.c"
 #include "optimized\reduce.c"
-#include "optimized\verify.c"
+#include "optimized\verify.c"