virgil-crypto 2.0.2b2 → 2.0.6r1

data/ext/native/src/utils/build.sh

@@ -74,7 +74,8 @@ function show_usage {
     echo -e "    * net_android      - build .NET library under Android platform, requirements: Mono, \$ANDROID_NDK;"
     echo -e "    * asmjs            - build AsmJS library, requirements: \$EMSDK_HOME;"
     echo -e "    * nodejs           - build NodeJS module;"
-    echo -e "    * pnacl            - build Portable Native library for Google Chrome, requirements: \$NACL_SDK_ROOT."
+    echo -e "    * pnacl            - build Portable Native library for Google Chrome, requirements: \$NACL_SDK_ROOT;"
+    echo -e "    * go               - build Golang library."
     echo -e "  - <src_dir>     - (default = .) path to the directory where root CMakeLists.txt file is located"
     echo -e "  - <build_dir>   - (default = build/<target>) path to the directory where temp files will be stored"
     echo -e "  - <install_dir> - (default = install/<target>) path to the directory where library files will be installed".
@@ -238,10 +239,14 @@ show_info "<install_dir>: ${INSTALL_DIR}"
 # Define common build parameters
 CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Release"
 
-if [[ ${TARGET_NAME} =~ ^(cpp|osx|java|net|php|python|ruby|nodejs)$ ]]; then
+if [[ ${TARGET_NAME} =~ ^(cpp|osx|java|net|php|python|ruby|nodejs|go)$ ]]; then
     CMAKE_ARGS+=" -DPLATFORM_ARCH=$(uname -m)"
 fi
 
+if [ "${TARGET_NAME}" == "go" ]; then
+    CMAKE_ARGS+=" -DINSTALL_CORE_LIBS=ON"
+fi
+
 if [ ! -z "${TARGET_VERSION}" ]; then
     CMAKE_ARGS+=" -DLANG_VERSION=${TARGET_VERSION}"
 fi
@@ -255,7 +260,7 @@ cd "${INSTALL_DIR}" && rm -fr ./*
 cd "${BUILD_DIR}" && rm -fr ./*
 
 # Build for native platforms
-if [[ ${TARGET_NAME} =~ ^(cpp|java|net|php|python|ruby|nodejs)$ ]]; then
+if [[ ${TARGET_NAME} =~ ^(cpp|java|net|php|python|ruby|nodejs|go)$ ]]; then
     cmake ${CMAKE_ARGS} -DLANG=${TARGET_NAME} -DPLATFORM_VERSION=${SYSTEM_KERNEL_RELEASE_VERSION} "${SRC_DIR}"
     make -j4 install
 fi

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

@@ -0,0 +1,92 @@
+#
+# Copyright (C) 2015-2016 Virgil Security Inc.
+#
+# Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
+#
+# 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.
+#
+
+cmake_minimum_required (VERSION 3.2 FATAL_ERROR)
+
+project (${WRAPPED_LIB_NAME}_go)
+
+set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
+set (GO_MODULE_NAME ${PROJECT_NAME})
+set (SWIG_MODULE_NAME ${GO_MODULE_NAME})
+
+find_host_package (SWIG REQUIRED)
+include (${SWIG_USE_FILE})
+
+set (CMAKE_SWIG_FLAGS "")
+
+set (SWIG_WRAP_COPY_CONSTRUCTOR YES)
+set (WRAPPER_INTERFACE_FILE "${CMAKE_CURRENT_BINARY_DIR}/wrapper.i")
+configure_file (
+    "${wrappers_SOURCE_DIR}/swig/wrapper.i.in"
+    "${WRAPPER_INTERFACE_FILE}"
+)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set (SWIG_TARGET_LINUX 1)
+endif ()
+
+configure_file (
+    "${wrappers_SOURCE_DIR}/swig/go/common.i.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/go/common.i"
+    @ONLY
+)
+
+if (CMAKE_SIZEOF_VOID_P)
+    math(EXPR GO_INT_SIZE "8 * ${CMAKE_SIZEOF_VOID_P}")
+else ()
+    math(EXPR GO_INT_SIZE 32)
+endif ()
+
+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}")
+
+set (GO_SWIG_TARGET_NAME ${SWIG_MODULE_${GO_MODULE_NAME}_REAL_NAME})
+
+add_library (${GO_SWIG_TARGET_NAME} STATIC ${swig_generated_source})
+
+install (PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${GO_MODULE_NAME}.go" DESTINATION ".")
+
+install (TARGETS ${GO_SWIG_TARGET_NAME}
+        RUNTIME DESTINATION "${INSTALL_BIN_DIR_NAME}"
+        LIBRARY DESTINATION "${INSTALL_LIB_DIR_NAME}"
+        ARCHIVE DESTINATION "${INSTALL_LIB_DIR_NAME}"
+)

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

@@ -123,7 +123,7 @@ if (UNIX AND NOT (CMAKE_SYSTEM_NAME MATCHES "Darwin"))
         string(REPLACE "<CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME>" ""
                 CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}")
     else ()
-        set_target_properties (${JAVA_SWIG_TARGET_NAME}
+        set_target_properties (${CSHARP_SWIG_TARGET_NAME}
                 PROPERTIES NO_SONAME OFF VERSION ${VIRGIL_VERSION} SOVERSION ${VIRGIL_SOVERSION})
     endif ()
 endif ()

data/ext/native/src/wrappers/net/src/VirgilStreamDataSink.cs

@@ -36,9 +36,7 @@
  */
 #endregion
 
-using virgil.crypto;
-
-namespace virgil.crypto {
+namespace Virgil.Crypto {
 
 public class VirgilStreamDataSink : VirgilDataSink
 {

data/ext/native/src/wrappers/net/src/VirgilStreamDataSource.cs

@@ -36,9 +36,7 @@
  */
 #endregion
 
-using virgil.crypto;
-
-namespace virgil.crypto {
+namespace Virgil.Crypto {
 
 public class VirgilStreamDataSource : VirgilDataSource
 {

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

@@ -36,12 +36,11 @@
 
 cmake_minimum_required (VERSION 3.2 FATAL_ERROR)
 
-set (RUBY_LIB_NAME ${WRAPPED_LIB_NAME}_ruby CACHE STRING "Generated lib name")
-project (${RUBY_LIB_NAME})
+project (${WRAPPED_LIB_NAME}_ruby)
 
 set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 set (RUBY_MODULE_NAME ${PROJECT_NAME})
-set (SWIG_MODULE_NAME ${RUBY_MODULE_NAME} CACHE STRING "Generated ruby module name")
+set (SWIG_MODULE_NAME ${RUBY_MODULE_NAME})
 
 find_host_package (Ruby REQUIRED)
 include_directories (SYSTEM ${RUBY_INCLUDE_DIRS})
@@ -56,7 +55,7 @@ endif (RUBY_VERSION)
 find_host_package (SWIG REQUIRED)
 include (${SWIG_USE_FILE})
 
-set (CMAKE_SWIG_FLAGS "" CACHE STRING "CMAKE SWIG FLAGS")
+set (CMAKE_SWIG_FLAGS "")
 
 set (SWIG_WRAP_COPY_CONSTRUCTOR YES)
 set (WRAPPER_INTERFACE_FILE "${CMAKE_CURRENT_BINARY_DIR}/wrapper.i")
@@ -66,10 +65,9 @@ configure_file (
 )
 
 set_property (SOURCE "${WRAPPER_INTERFACE_FILE}" PROPERTY CPLUSPLUS ON)
-set_property (SOURCE "${WRAPPER_INTERFACE_FILE}" PROPERTY SWIG_FLAGS "-ignoremissing")
+set_property (SOURCE "${WRAPPER_INTERFACE_FILE}" PROPERTY SWIG_FLAGS "-ignoremissing;-autorename")
 
 swig_add_module (${RUBY_MODULE_NAME} ruby "${WRAPPER_INTERFACE_FILE}")
-
 set (SWIG_TARGET ${SWIG_MODULE_${RUBY_MODULE_NAME}_REAL_NAME})
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

data/ext/native/src/wrappers/swig/common.i

@@ -34,6 +34,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+// Define type map for size_t
+%apply unsigned int { size_t };
+
 // Ignore C++ operators
 %ignore operator=;
 %ignore operator==;
@@ -51,6 +54,10 @@
     %include "java/common.i"
 #endif
 
+#if defined(SWIGGO)
+    %include "go/common.i"
+#endif
+
 // Define VirgilByteArray typemap if was not defined yet
 #ifndef SWIG_VIRGIL_BYTE_ARRAY
 #define SWIG_VIRGIL_BYTE_ARRAY

data/ext/native/src/wrappers/swig/go/common.i.in

@@ -0,0 +1,66 @@
+/**
+ * Copyright (C) 2015-2016 Virgil Security Inc.
+ *
+ * Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>
+ *
+ * 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.
+ */
+
+#cmakedefine SWIG_TARGET_LINUX
+
+%insert(cgo_comment_typedefs) %{
+#cgo CPPFLAGS: -I${SRCDIR}/include
+#cgo LDFLAGS: -L${SRCDIR}/lib -lvirgil_crypto_go -lvirgil_crypto -lmbedcrypto -led25519 -lstdc++
+%}
+#if defined(SWIG_TARGET_LINUX)
+%insert(cgo_comment_typedefs) %{
+#cgo LDFLAGS: -lm
+%}
+#endif
+
+%define SWIG_CATCH_STDEXCEPT
+  /* catching std::exception  */
+  catch (std::invalid_argument& e) {
+    SWIG_exception(SWIG_ValueError, e.what() );
+  } catch (std::domain_error& e) {
+    SWIG_exception(SWIG_ValueError, e.what() );
+  } catch (std::overflow_error& e) {
+    SWIG_exception(SWIG_OverflowError, e.what() );
+  } catch (std::out_of_range& e) {
+    SWIG_exception(SWIG_IndexError, e.what() );
+  } catch (std::length_error& e) {
+    SWIG_exception(SWIG_IndexError, e.what() );
+  } catch (std::runtime_error& e) {
+    SWIG_exception(SWIG_RuntimeError, e.what() );
+  } catch (std::exception& e) {
+    SWIG_exception(SWIG_SystemError, e.what() );
+  }
+%enddef

data/ext/native/src/wrappers/swig/util.i

@@ -53,6 +53,7 @@ DEFINE_NAMESPACE(className, package)
 #include <includePath/className.h>
 %}
 %ignore package::className::className(className&&);
+%ignore package::className::operator=(className&&);
 %include <includePath/className.h>
 %enddef
 

data/ext/rakefile.rb

@@ -0,0 +1,65 @@
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+
+task :default do
+  require 'virgil/native_crypto'
+  require 'mkmf'
+
+  abort "Sorry, we don't support Ruby with version 2.0! Please Upgrade you Ruby version." if RUBY_VERSION =~ /^2\.0\./
+
+  begin
+    NativeCrypto.load_library
+
+  rescue
+
+    SCRIPT_DIR = File.expand_path('../', __FILE__)
+    ROOT_DIR = File.expand_path('../..', __FILE__)
+    SRC_DIR = File.join(SCRIPT_DIR, 'native/src')
+    CURRENT_DIR = Dir.pwd
+    LIB_DIR = File.join(ROOT_DIR, "lib")
+    INSTALL_DIR = File.join(LIB_DIR, 'virgil', 'crypto')
+    ext = OS.linux? ? "so" : "bundle"
+
+    # unless File.exists?(File.join(INSTALL_DIR, "virgil_crypto_ruby.#{ext}"))
+    BUILD_DIR = File.join(ROOT_DIR, "build")
+    mkdir_p BUILD_DIR
+    cd BUILD_DIR
+
+    CMAKE = find_executable "cmake"
+    abort "cmake >= 3.2 is required" unless CMAKE
+
+
+    INCLUDE_DIRS = [
+        RUBY_INCLUDE_DIR = RbConfig::CONFIG['rubyhdrdir'],
+        RUBY_CONFIG_INCLUDE_DIR=RbConfig::CONFIG['rubyarchhdrdir']
+    ].join(' ').quote
+    RUBY_LIB_DIR = RbConfig::CONFIG['libdir']
+
+    CMAKE_COMMAND = [
+        CMAKE,
+        '-DCMAKE_BUILD_TYPE=Release',
+        "-DRUBY_VERSION=#{RUBY_VERSION}",
+        "-DRUBY_INCLUDE_DIR=#{RUBY_INCLUDE_DIR}",
+        "-DRUBY_CONFIG_INCLUDE_DIR=#{RUBY_CONFIG_INCLUDE_DIR}",
+        "-DRUBY_INCLUDE_DIRS=#{INCLUDE_DIRS}",
+        "-DRUBY_LIBRARY=#{RUBY_LIB_DIR}",
+        '-DCMAKE_SWIG_FLAGS=-autorename',
+        "-DCMAKE_INSTALL_PREFIX=#{CURRENT_DIR}",
+        "-DINSTALL_API_DIR_NAME=#{INSTALL_DIR}",
+        "-DINSTALL_LIB_DIR_NAME=#{INSTALL_DIR}",
+        '-DLANG=ruby',
+        SRC_DIR
+    ].join(' ')
+
+    system(CMAKE_COMMAND)
+    system('make -j4')
+    system('make install')
+
+    cd '../'
+    rm_rf BUILD_DIR
+  end
+  # end
+end
+
+

data/lib/virgil/crypto.rb

@@ -1,10 +1,10 @@
 require "virgil/crypto/version"
-
 module Virgil
   module Crypto
-    autoload :Native, 'virgil/crypto/native'
+    autoload :Virgil_crypto_ruby, 'virgil/crypto/virgil_crypto_ruby'
     autoload :Bytes, 'virgil/crypto/bytes'
     autoload :VirgilStreamDataSink, 'virgil/crypto/virgil_stream_data_sink'
     autoload :VirgilStreamDataSource, 'virgil/crypto/virgil_stream_data_source'
+    Native = Virgil_crypto_ruby
   end
 end

data/lib/virgil/crypto/bytes.rb

@@ -52,6 +52,10 @@ module Virgil
       def to_json(*a)
         Base64.strict_encode64(to_s).to_json(*a)
       end
+
+      def to_base64
+        Base64.strict_encode64(to_s)
+      end
     end
   end
 end

data/lib/virgil/crypto/version.rb

@@ -1,5 +1,5 @@
 module Virgil
   module Crypto
-    VERSION = "2.0.2b2"
+    VERSION = "2.0.6r1"
   end
 end

data/lib/virgil/crypto/virgil_stream_data_sink.rb

@@ -34,19 +34,20 @@
 
 module Virgil
   module Crypto
-    class VirgilStreamDataSink < Virgil::Crypto::Native::VirgilDataSink
+    class VirgilStreamDataSink < Native::VirgilDataSink
       attr_reader :stream
 
       def initialize(stream)
         @stream = stream
+        super()
       end
 
       def is_good
-        !steam.closed? && !stream.eof?
+        !stream.closed_write?
       end
 
       def write(data)
-        stream.write(Bytes.new(data))
+        stream.write(data.pack('c*'))
       end
     end
   end

data/lib/virgil/crypto/virgil_stream_data_source.rb

@@ -34,20 +34,21 @@
 
 module Virgil
   module Crypto
-    class VirgilStreamDataSource < Virgil::Crypto::Native::VirgilDataSource
+    class VirgilStreamDataSource < Native::VirgilDataSource
       attr_reader :stream, :buffer_size
 
       def initialize(stream, buffer_size = 1024)
         @stream = stream
         @buffer_size = buffer_size
+        super()
       end
 
       def has_data
-        !steam.closed? && !stream.eof?
+        !stream.closed_read? && !stream.eof?
       end
 
       def read
-        stream.read(buffer_size)
+        Bytes.from_string(stream.read(buffer_size))
       end
     end
   end