Merge pull request #161 from ademcan/master

Add Dilithium+Kyber to webAssembly build

Author: jplomas

.circleci/build_emscripten.sh

@@ -7,8 +7,12 @@ emmake make
 emcc --bind libjsqrl.so -s DISABLE_EXCEPTION_CATCHING=0 -O3 --memory-init-file 0  -o libjsqrl.js
 emcc --bind libjsqrl.so -s DISABLE_EXCEPTION_CATCHING=0 -O3 -s WASM=1 -o web-libjsqrl.js
 emcc --bind libjsqrl.so -s DISABLE_EXCEPTION_CATCHING=0 -O3 -s WASM=1 -s SINGLE_FILE=1 -o offline-libjsqrl.js
+emcc --bind libjsdilithium.so -s DISABLE_EXCEPTION_CATCHING=0 -O3 -s WASM=1 -s SINGLE_FILE=1 -o offline-libjsdilithium.js
+emcc --bind libjskyber.so -s DISABLE_EXCEPTION_CATCHING=0 -O3 -s WASM=1 -s SINGLE_FILE=1 -o offline-libjskyber.js
 echo "QRLLIB=Module;" >> web-libjsqrl.js
 echo "QRLLIB=Module;" >> offline-libjsqrl.js
+echo "DILLIB=Module;" >> offline-libjsdilithium.js
+echo "KYBLIB=Module;" >> offline-libjskyber.js
 
 # Fix paths of web-libjsqrl.wasm for web clients
 sed -i 's/web-libjsqrl\.wasm/\/web-libjsqrl\.wasm/g' web-libjsqrl.js

.gitignore

@@ -72,3 +72,4 @@ tests/js/tmp/*.js
 tests/js/tmp/*.wasm
 
 \.npmrc
+.vscode/*

CMakeLists.txt

@@ -552,22 +552,31 @@ if (BUILD_WEBASSEMBLY)
             PROPERTIES LINK_FLAGS "-s DISABLE_EXCEPTION_CATCHING=0"
             )
 
-#    set(JS_DILITHIUM_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src/jswrapper/jsdilwrapper.cpp)
-#    set(JS_KYBINTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src/jswrapper/jskybwrapper.cpp)
-#    add_library(jsdilithium SHARED
-#            ${JS_DILITHIUM_INTERFACE}
-#            ${LIB_KYBER_SRC}
-#            ${LIBDILITHIUM_SRC}
-#            )
-#    target_include_directories( jsdilithium PRIVATE
-#            ${LIB_DILITHIUM_INCLUDES} )
-#
-#    add_library(jskyber SHARED
-#            ${JS_KYBER_INTERFACE}
-#            ${LIB_KYBER_SRC}
-#            ${LIBKYBER_SRC}
-#            )
-#    target_include_directories( jskyber PRIVATE
-#            ${LIB_KYBER_INCLUDES} )
+
+   set(JS_DILITHIUM_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src/jswrapper/jsdilwrapper.cpp)
+
+   add_library(jsdilithium SHARED
+           ${JS_DILITHIUM_INTERFACE}
+           ${LIB_DILITHIUM_SRC}
+           ${LIBDILITHIUM_SRC}
+           ${REF_DILITHIUM_SRC}
+           ${LIB_QRL_SRC}
+           )
+   target_include_directories( jsdilithium PRIVATE
+        ${LIB_QRL_INCLUDES}
+        ${LIB_DILITHIUM_INCLUDES} )
+
+   set(JS_KYBER_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src/jswrapper/jskybwrapper.cpp)
+
+   add_library(jskyber SHARED
+           ${JS_KYBER_INTERFACE}
+           ${LIB_KYBER_SRC}
+           ${LIBKYBER_SRC}
+           ${REF_KYBER_SRC}
+           ${LIB_QRL_SRC}
+           )
+   target_include_directories( jskyber PRIVATE
+           ${LIB_QRL_INCLUDES}
+           ${LIB_KYBER_INCLUDES} )
 
 endif ()

src/jswrapper/jsdilwrapper.cpp

@@ -1,6 +1,79 @@
 #include <emscripten.h>
 #include <emscripten/bind.h>
 #include <iostream>
+#include <dilithium.h>
+#include <misc.h>
 
 namespace {
+    class DilithiumWrapper {
+    explicit DilithiumWrapper()
+        :_dilithium() { }
+    
+    public:
+
+        static DilithiumWrapper empty()
+        {
+            return DilithiumWrapper();
+        }
+
+        std::vector<uint8_t> getSKRaw()
+        {   
+            return _dilithium.getSK() ;
+        }
+
+        std::string getSK()
+        {
+            return bin2hstr( _dilithium.getSK() );
+        }
+
+        std::vector<uint8_t> getPKRaw()
+        {   
+            return _dilithium.getPK() ;
+        }
+
+        std::string getPK()
+        {
+            return bin2hstr( _dilithium.getPK() );
+        }
+
+    private:
+        Dilithium _dilithium;
+};
+
+std::string EMSCRIPTEN_KEEPALIVE
+_bin2hstr(const std::vector<unsigned char>& input)
+{
+    return bin2hstr(input, 0);
+}
+
+std::string EMSCRIPTEN_KEEPALIVE
+_getString()
+{
+    return "Test String from Dilithium JS Wrapper";
+}
+
+int EMSCRIPTEN_KEEPALIVE
+crypto_sign_keypair(
+    unsigned char pk,
+    unsigned char sk)
+{
+    return crypto_sign_keypair(pk, sk);
+}
+
+using namespace emscripten;
+
+EMSCRIPTEN_BINDINGS(my_module) {
+
+    function("getString", &_getString);
+    function("crypto_sign_keypair", &crypto_sign_keypair);
+    function("bin2hstr", &_bin2hstr);
+
+    class_<DilithiumWrapper>("Dilithium")
+        .class_function("empty", &DilithiumWrapper::empty)
+        .function("getPKRaw", &DilithiumWrapper::getPKRaw)
+        .function("getPK", &DilithiumWrapper::getPK)
+        .function("getSKRaw", &DilithiumWrapper::getSKRaw)
+        .function("getSK", &DilithiumWrapper::getSK);
+    }
+
 }

src/jswrapper/jskybwrapper.cpp

@@ -1,6 +1,79 @@
 #include <emscripten.h>
 #include <emscripten/bind.h>
 #include <iostream>
+#include <kyber.h>
+#include <misc.h>
 
 namespace {
+    class KyberWrapper {
+    explicit KyberWrapper()
+        :_kyber() { }
+    
+    public:
+
+        static KyberWrapper empty()
+        {
+            return KyberWrapper();
+        }
+
+        std::vector<uint8_t> getSKRaw()
+        {   
+            return _kyber.getSK() ;
+        }
+
+        std::string getSK()
+        {
+            return bin2hstr( _kyber.getSK() );
+        }
+
+        std::vector<uint8_t> getPKRaw()
+        {   
+            return _kyber.getPK() ;
+        }
+
+        std::string getPK()
+        {
+            return bin2hstr( _kyber.getPK() );
+        }
+
+    private:
+        Kyber _kyber;
+};
+
+std::string EMSCRIPTEN_KEEPALIVE
+_bin2hstr(const std::vector<unsigned char>& input)
+{
+    return bin2hstr(input, 0);
+}
+
+std::string EMSCRIPTEN_KEEPALIVE
+_getString()
+{
+    return "Test String from Kyber JS Wrapper";
+}
+
+int EMSCRIPTEN_KEEPALIVE
+crypto_kem_keypair(
+    unsigned char pk,
+    unsigned char sk)
+{
+    return crypto_kem_keypair(pk, sk);
+}
+
+using namespace emscripten;
+
+EMSCRIPTEN_BINDINGS(my_module) {
+
+    function("getString", &_getString);
+    function("crypto_kem_keypair", &crypto_kem_keypair);
+    function("bin2hstr", &_bin2hstr);
+
+    class_<KyberWrapper>("Kyber")
+        .class_function("empty", &KyberWrapper::empty)
+        .function("getPKRaw", &KyberWrapper::getPKRaw)
+        .function("getPK", &KyberWrapper::getPK)
+        .function("getSKRaw", &KyberWrapper::getSKRaw)
+        .function("getSK", &KyberWrapper::getSK);
+    }
+
 }