virgil-crypto 2.3.0 → 3.6.2

data/ext/native/src/wrappers/emsdk/wrapper.cxx

@@ -37,6 +37,8 @@
 #include <string>
 #include <memory>
 
+#include "VirgilConfig.h"
+
 #include <virgil/crypto/VirgilVersion.h>
 #include <virgil/crypto/VirgilByteArray.h>
 #include <virgil/crypto/VirgilByteArrayUtils.h>
@@ -74,12 +76,15 @@
 #include <virgil/crypto/pfs/VirgilPFSResponderPrivateInfo.h>
 #include <virgil/crypto/pfs/VirgilPFS.h>
 
+#include <virgil/crypto/pythia/VirgilPythia.h>
+
 #include "@VIRGIL_EMBIND_FILE@"
 
 using namespace emscripten;
 using namespace virgil::crypto;
 using namespace virgil::crypto::foundation;
 using namespace virgil::crypto::pfs;
+using namespace virgil::crypto::pythia;
 
 namespace virgil { namespace crypto {
 
@@ -144,6 +149,12 @@ EMSCRIPTEN_BINDINGS(virgil_crypto) {
         .class_function("patchVersion", &VirgilVersion::patchVersion)
     ;
 
+    class_<VirgilConfig>("Config")
+        .class_function("hasFeatureStreamImpl", &VirgilConfig::hasFeatureStreamImpl)
+        .class_function("hasFeaturePythiaImpl", &VirgilConfig::hasFeaturePythiaImpl)
+        .class_function("hasFeaturePythiaMultiThread", &VirgilConfig::hasFeaturePythiaMultiThread)
+    ;
+
     register_vector<unsigned char>("VirgilByteArray")
         .function("data", VirgilByteArray_data)
         .function("assign", VirgilByteArray_assign)
@@ -156,6 +167,8 @@ EMSCRIPTEN_BINDINGS(virgil_crypto) {
         .class_function("generate", &VirgilKeyPair::generate)
         .class_function("generateRecommended", &VirgilKeyPair::generateRecommended)
         .class_function("generateFrom", &VirgilKeyPair::generateFrom)
+        .class_function("generateFromKeyMaterial", &VirgilKeyPair::generateFromKeyMaterial)
+        .class_function("generateRecommendedFromKeyMaterial", &VirgilKeyPair::generateRecommendedFromKeyMaterial)
         .class_function("isKeyPairMatch", &VirgilKeyPair::isKeyPairMatch)
         .class_function("checkPrivateKeyPassword", &VirgilKeyPair::checkPrivateKeyPassword)
         .class_function("isPrivateKeyEncrypted", &VirgilKeyPair::isPrivateKeyEncrypted)
@@ -518,3 +531,45 @@ EMSCRIPTEN_BINDINGS(virgil_crypto_pfs) {
             .function("setSession", &VirgilPFS::setSession)
         ;
 }
+
+#if VIRGIL_CRYPTO_FEATURE_PYTHIA
+
+EMSCRIPTEN_BINDINGS(virgil_crypto_pythia) {
+        class_<VirgilPythia>("VirgilPythia")
+            .constructor<>()
+            .function("blind", &VirgilPythia::blind)
+            .function("deblind", &VirgilPythia::deblind)
+            .function("computeTransformationKeyPair", &VirgilPythia::computeTransformationKeyPair)
+            .function("transform", &VirgilPythia::transform)
+            .function("prove", &VirgilPythia::prove)
+            .function("verify", &VirgilPythia::verify)
+            .function("getPasswordUpdateToken", &VirgilPythia::getPasswordUpdateToken)
+            .function("updateDeblindedWithToken", &VirgilPythia::updateDeblindedWithToken)
+        ;
+
+        class_<VirgilPythiaBlindResult>("VirgilPythiaBlindResult")
+            .constructor<VirgilByteArray, VirgilByteArray>()
+            .function("blindedPassword", &VirgilPythiaBlindResult::blindedPassword)
+            .function("blindingSecret", &VirgilPythiaBlindResult::blindingSecret)
+        ;
+
+        class_<VirgilPythiaProveResult>("VirgilPythiaProveResult")
+            .constructor<VirgilByteArray, VirgilByteArray>()
+            .function("proofValueC", &VirgilPythiaProveResult::proofValueC)
+            .function("proofValueU", &VirgilPythiaProveResult::proofValueU)
+        ;
+
+        class_<VirgilPythiaTransformationKeyPair>("VirgilPythiaTransformationKeyPair")
+                .constructor<VirgilByteArray, VirgilByteArray>()
+                .function("privateKey", &VirgilPythiaTransformationKeyPair::privateKey)
+                .function("publicKey", &VirgilPythiaTransformationKeyPair::publicKey)
+        ;
+
+        class_<VirgilPythiaTransformResult>("VirgilPythiaTransformResult")
+            .constructor<VirgilByteArray, VirgilByteArray>()
+            .function("transformedPassword", &VirgilPythiaTransformResult::transformedPassword)
+            .function("transformedTweak", &VirgilPythiaTransformResult::transformedTweak)
+        ;
+}
+
+#endif /* VIRGIL_CRYPTO_FEATURE_PYTHIA */

data/ext/native/src/wrappers/go/CMakeLists.txt

@@ -75,13 +75,14 @@ message (STATUS "Size of Golang integer: ${GO_INT_SIZE}")
 set_property (SOURCE "${WRAPPER_INTERFACE_FILE}" PROPERTY CPLUSPLUS ON)
 set_property (SOURCE "${WRAPPER_INTERFACE_FILE}" PROPERTY SWIG_FLAGS "-ignoremissing;-cgo;-intgosize;${GO_INT_SIZE}")
 
-set (swig_generated_sources)
-swig_module_initialize (${GO_MODULE_NAME} go)
-swig_add_source_to_module (${GO_MODULE_NAME} swig_generated_source "${WRAPPER_INTERFACE_FILE}")
+swig_add_library (${GO_MODULE_NAME}
+        TYPE STATIC
+        LANGUAGE go
+        SOURCES "${WRAPPER_INTERFACE_FILE}")
 
+swig_link_libraries (${GO_MODULE_NAME} ${WRAPPED_LIB_NAME})
 set (GO_SWIG_TARGET_NAME ${SWIG_MODULE_${GO_MODULE_NAME}_REAL_NAME})
-
-add_library (${GO_SWIG_TARGET_NAME} STATIC ${swig_generated_source})
+set_target_properties (${GO_SWIG_TARGET_NAME} PROPERTIES PREFIX "lib")
 
 install (PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${GO_MODULE_NAME}.go" DESTINATION ".")
 

data/ext/native/src/wrappers/java/CMakeLists.txt

@@ -38,17 +38,24 @@ cmake_minimum_required (VERSION 3.10 FATAL_ERROR)
 
 project (${WRAPPED_LIB_NAME}_java)
 
+#
 # Configure Java
+#
 set (JAVA_MODULE_NAME ${PROJECT_NAME})
 set (JAVA_JAR_NAME ${JAVA_MODULE_NAME})
 set (JAVA_JAR_TARGET_NAME ${JAVA_MODULE_NAME}_jar)
 set (SWIG_MODULE_NAME ${JAVA_MODULE_NAME})
+set(CMAKE_JAVA_COMPILE_FLAGS -source 1.7 -target 1.7)
 
+#
 # Find Java
+#
 find_host_package (Java REQUIRED)
 include (UseJava)
 
+#
 # Find Java JNI
+#
 if (ANDROID)
     find_path (JAVA_INCLUDE_PATH jni.h)
     set (JNI_INCLUDE_DIRS ${JAVA_INCLUDE_PATH})
@@ -57,13 +64,17 @@ else (ANDROID)
 endif (ANDROID)
 include_directories (SYSTEM ${JNI_INCLUDE_DIRS})
 
+#
 # Make sure the nested directory structure exists
+#
 set (JAVA_BINARY_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE INTERNAL "")
 set (JAVA_SWIG_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src CACHE INTERNAL "")
 file (MAKE_DIRECTORY ${JAVA_BINARY_DIRECTORY})
 file (MAKE_DIRECTORY ${JAVA_SWIG_OUTPUT_DIRECTORY})
 
+#
 # Configure SWIG
+#
 find_host_package (SWIG REQUIRED)
 include (${SWIG_USE_FILE})
 
@@ -83,12 +94,17 @@ set_property (
     SOURCE "${WRAPPER_INTERFACE_FILE}" PROPERTY SWIG_FLAGS "-ignoremissing;-package;com.virgilsecurity.crypto"
 )
 
-swig_add_module (${JAVA_MODULE_NAME} java ${WRAPPER_INTERFACE_FILE})
+swig_add_library (${JAVA_MODULE_NAME}
+        LANGUAGE java
+        SOURCES "${WRAPPER_INTERFACE_FILE}")
+
 swig_link_libraries (${JAVA_MODULE_NAME} ${WRAPPED_LIB_NAME})
 
 set (JAVA_SWIG_TARGET_NAME ${SWIG_MODULE_${JAVA_MODULE_NAME}_REAL_NAME})
 
+#
 # Configure assembly
+#
 set_target_properties (${JAVA_SWIG_TARGET_NAME}
         PROPERTIES OUTPUT_NAME ${JAVA_MODULE_NAME})
 set_target_properties (${JAVA_SWIG_TARGET_NAME}
@@ -117,15 +133,20 @@ foreach (JAVA_FILE ${JAVA_SRC})
     )
 endforeach (JAVA_FILE)
 
+#
 # Add assembly dependencies
+#
 add_jar (${JAVA_JAR_TARGET_NAME}
-    "${CMAKE_CURRENT_BINARY_DIR}/src/VirgilStreamDataSink.java"
-    "${CMAKE_CURRENT_BINARY_DIR}/src/VirgilStreamDataSource.java"
+    # Just add one source to satisfy precondition for 'java_sources' file creation.
+    # All *.java files will be added when SWIG generates them.
+    "${CMAKE_CURRENT_BINARY_DIR}/src/JniLoader.java"
     OUTPUT_NAME ${JAVA_JAR_NAME}
 )
 add_dependencies (${JAVA_JAR_TARGET_NAME} ${JAVA_SWIG_TARGET_NAME})
 
-# Payload 'java_sources' file with generated classes
+#
+# Payload file 'java_sources' with generated classes and custom classes.
+#
 get_property (JAVA_CLASS_DIR TARGET ${JAVA_JAR_TARGET_NAME} PROPERTY CLASS_DIR)
 if (NOT JAVA_CLASS_DIR)
     get_property (JAVA_CLASS_DIR TARGET ${JAVA_JAR_TARGET_NAME} PROPERTY CLASSDIR)
@@ -142,7 +163,9 @@ add_custom_command (TARGET ${JAVA_SWIG_TARGET_NAME} POST_BUILD
         COMMENT "Create java source list file: ${JAVA_SOURCE_LIST_FILE}."
     )
 
+#
 # Install
+#
 set (PLATFORM_VERSION "${Java_VERSION_MAJOR}.${Java_VERSION_MINOR}" PARENT_SCOPE)
 
 if (ANDROID)

data/ext/native/src/wrappers/java/src/JniLoader.java

@@ -0,0 +1,167 @@
+/**
+ * Copyright (C) 2015-2018 Virgil Security Inc.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     (1) Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *     (2) Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *     (3) Neither the name of the copyright holder nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
+ */
+
+package com.virgilsecurity.crypto;
+
+import java.io.*;
+import java.util.logging.Logger;
+
+
+public class JniLoader {
+    private static final Logger LOGGER = Logger.getLogger(JniLoader.class.getName());
+
+    private static final String MACOS_OS_NAME = "mac os";
+    private static final String LINUX_OS_NAME = "linux";
+    private static final String WINDOWS_OS_NAME = "windows";
+    private static final String UNKNOWN_OS = "unknown";
+
+    private static final String MACOS_LIBS_DIRECTORY = MACOS_OS_NAME;
+    private static final String LINUX_LIBS_DIRECTORY = LINUX_OS_NAME;
+    private static final String WINDOWS_LIBS_DIRECTORY = WINDOWS_OS_NAME;
+
+    private static final String SEPARATOR = "/";
+
+    static {
+        try {
+            loadNativeLibrary("virgil_crypto_java");
+        } catch (Exception error) {
+            LOGGER.severe("JNI library failed to load.\n" +
+                                  "Try to add OS specific JNI library to java.library.path, " +
+                                  "or to put all libraries into the \'resources\' folder with such structure:\n" +
+                                  "../src/main/resources\n" +
+                                  "|\n" +
+                                  "+---linux\n" +
+                                  "|\t|\n" +
+                                  "|\t+---virgil_crypto_java\n" +
+                                  "+---mac os\n" +
+                                  "|\t|\n" +
+                                  "|\t+---virgil_crypto_java\n"
+                                  +"+---windows\n" +
+                                  "\t|\n" +
+                                  "\t+---amd64\n" +
+                                  "\t|\t|\n" +
+                                  "\t|\t+---virgil_crypto_java\n" +
+                                  "\t+---x86\n" +
+                                  "\t\t|\n" +
+                                  "\t\t+---virgil_crypto_java");
+
+            LOGGER.severe(error.getMessage());
+        }
+    }
+
+    private static void loadNativeLibrary(String libraryName) throws IOException {
+        try {
+            System.loadLibrary(libraryName);
+            // Library is loaded (Android or exists in java.library.path).
+            return;
+        } catch (Throwable e) {
+            // Library couldn't be loaded yet.
+            // We'll try to load it from resources.
+            LOGGER.warning("JNI library can't be loaded from java.library.path or Android specific folders.\n" +
+                                   "Please, check whether your path to JNI library is correct.");
+        }
+
+        LOGGER.info("Trying to load JNI library from resources.");
+
+        // Build native library name according to current system
+        String osName = System.getProperty("os.name").toLowerCase();
+        String os = getOS(osName);
+        String osArch = System.getProperty("os.arch").toLowerCase();
+
+        StringBuilder resourceName = new StringBuilder();
+        resourceName.append(getResourceDirectory(os, osArch)).append(SEPARATOR).append(libraryName);
+
+        // Save native library as temporary file
+        InputStream in = virgil_crypto_javaJNI.class.getClassLoader().getResourceAsStream(resourceName.toString());
+        if (in == null) {
+            LOGGER.warning("Can't load JNI library from resources.");
+            throw new FileNotFoundException("Resource \'" + resourceName.toString() + "\' not found");
+        }
+
+        byte[] buffer = new byte[1024];
+        int read;
+        File temp = File.createTempFile(libraryName, getLibraryFileSuffix(os));
+
+        FileOutputStream fos = new FileOutputStream(temp);
+
+        while ((read = in.read(buffer)) != -1) {
+            fos.write(buffer, 0, read);
+        }
+        fos.close();
+        in.close();
+
+        System.load(temp.getAbsolutePath());
+    }
+
+    private static final String getLibraryFileSuffix(String os) {
+        switch (os) {
+            case LINUX_OS_NAME:
+            case MACOS_OS_NAME:
+                return ".so";
+            case WINDOWS_OS_NAME:
+                return ".dll";
+        }
+        return "";
+    }
+
+    /**
+     * Get operation system by operation system name
+     *
+     * @param osName
+     *            The OS name.
+     * @return
+     */
+    private static final String getOS(String osName) {
+        for (String os : new String[] { LINUX_OS_NAME, WINDOWS_OS_NAME, MACOS_OS_NAME }) {
+            if (osName.startsWith(os)) {
+                return os;
+            }
+        }
+        return UNKNOWN_OS;
+    }
+
+    private static final String getResourceDirectory(String os, String osArch) {
+        switch (os) {
+            case LINUX_OS_NAME:
+                return LINUX_LIBS_DIRECTORY;
+            case MACOS_OS_NAME:
+                return MACOS_LIBS_DIRECTORY;
+            case WINDOWS_OS_NAME:
+                return WINDOWS_LIBS_DIRECTORY + SEPARATOR + osArch;
+        }
+        return "";
+    }
+}

data/ext/native/src/wrappers/net/CMakeLists.txt

@@ -51,9 +51,38 @@ set (CSHARP_MODULE_NAME ${PROJECT_NAME})
 set (SWIG_MODULE_NAME ${CSHARP_MODULE_NAME})
 
 # Find C#
-find_host_package( CSharp REQUIRED )
+find_host_package (CSharp REQUIRED)
 include (${CSHARP_USE_FILE})
 
+if (CSHARP_MONO_FOUND AND APPLE_PLATFORM MATCHES "(IOS|TVOS|WATCHOS)")
+    find_host_library(XAMARIN_FRAMEWORK_PATH "Xamarin.iOS")
+    if (NOT XAMARIN_FRAMEWORK_PATH)
+        message (FATAL_ERROR "Can't find Xamarin.iOS framework!")
+    endif ()
+
+    # Define Xamarin library for target Apple Platform.
+    if (APPLE_PLATFORM MATCHES "IOS")
+        set (XAMARIN_PLATFROM_LIB_NAME "Xamarin.iOS")
+
+    elseif (APPLE_PLATFORM MATCHES "TVOS")
+        set (XAMARIN_PLATFROM_LIB_NAME "Xamarin.TVOS")
+
+    elseif (APPLE_PLATFORM MATCHES "WATCHOS")
+        set (XAMARIN_PLATFROM_LIB_NAME "Xamarin.WatchOS")
+
+    endif ()
+
+    set (XAMARIN_PLATFROM_LIB
+            "${XAMARIN_FRAMEWORK_PATH}/Versions/Current/lib/mono/${XAMARIN_PLATFROM_LIB_NAME}/${XAMARIN_PLATFROM_LIB_NAME}.dll")
+
+    if (NOT EXISTS "${XAMARIN_PLATFROM_LIB}")
+        message (FATAL_ERROR "Xamarin library for traget ${APPLE_PLATFORM} is not found: ${XAMARIN_PLATFROM_LIB}")
+    endif ()
+
+    set (MONO_FRAMEWORKS "${XAMARIN_PLATFROM_LIB}")
+    message (STATUS "Mono frameworks: ${MONO_FRAMEWORKS}" )
+endif()
+
 # Make sure the nested directory structure exists
 set (CSHARP_SOURCE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src CACHE INTERNAL "")
 set (CSHARP_BINARY_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE INTERNAL "")
@@ -86,7 +115,7 @@ set_property (
     SOURCE "${WRAPPER_INTERFACE_FILE}" PROPERTY SWIG_FLAGS "-ignoremissing"
 )
 
-if (CMAKE_CROSSCOMPILING AND APPLE)
+if ( CMAKE_CROSSCOMPILING AND APPLE )
     set (WRAPPER_TYPE STATIC)
 else ()
     set (WRAPPER_TYPE SHARED)
@@ -99,14 +128,14 @@ swig_add_library (${CSHARP_MODULE_NAME}
 )
 set (CSHARP_SWIG_TARGET_NAME ${SWIG_MODULE_${CSHARP_MODULE_NAME}_REAL_NAME})
 
-if (WRAPPER_TYPE STREQUAL "STATIC")
+# todo remove patching for mono when the issue https://github.com/swig/swig/issues/1165 is closed.
+if (WRAPPER_TYPE STREQUAL "STATIC" AND APPLE)
     add_custom_command (TARGET ${CSHARP_SWIG_TARGET_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND}
         ARGS
+            -DCSHARP_MODULE_NAME:STRING="${CSHARP_MODULE_NAME}"
             -DSRC:PATH="${CSHARP_SWIG_OUTPUT_DIRECTORY}/${CSHARP_MODULE_NAME}PINVOKE.cs"
-            -DREGULAR_EXPRESSION:STRING="DllImport\\\(\\\"${CSHARP_MODULE_NAME}\\\""
-            -DREPLACE_EXPRESSION:STRING="DllImport\(\\\"__Internal\\\""
-            -P ${CMAKE_SOURCE_DIR}/cmake/file_regex_replace.cmake
+            -P ${CMAKE_SOURCE_DIR}/cmake/add_mono_metadata.cmake
         COMMENT "Patch generated source files for mono."
     )
 endif ()
@@ -143,8 +172,12 @@ if (UNIX AND NOT APPLE)
 endif ()
 
 # Configure assembly
+if (CMAKE_SYSTEM_NAME MATCHES "Android")
+    set_target_properties (${CSHARP_SWIG_TARGET_NAME} PROPERTIES PREFIX "lib")
+endif ()
+
 set_target_properties (${CSHARP_SWIG_TARGET_NAME}
-        PROPERTIES OUTPUT_NAME ${CSHARP_MODULE_NAME})
+        PROPERTIES OUTPUT_NAME "${CSHARP_MODULE_NAME}")
 set_target_properties (${CSHARP_SWIG_TARGET_NAME}
         PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CSHARP_BINARY_DIRECTORY})
 set_target_properties (${CSHARP_SWIG_TARGET_NAME}
@@ -161,7 +194,7 @@ foreach (CS_FILE ${ASSEMBLY_SRC})
 endforeach (CS_FILE)
 
 # Add assembly dependencies
-csharp_add_library (${CSHARP_ASSEMBLY_NAME} "${CSHARP_SOURCE_DIRECTORY}/*.cs")
+csharp_add_library (${CSHARP_ASSEMBLY_NAME} "${CSHARP_SOURCE_DIRECTORY}/*.cs" ${MONO_FRAMEWORKS})
 add_dependencies (${CSHARP_ASSEMBLY_NAME} ${CSHARP_SWIG_TARGET_NAME})
 
 # Install