virgil-crypto 2.1.2 → 2.1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6080543e6b52aef32d11bd1efc81321e2c3112a2
-  data.tar.gz: eed1f1f61e2b82374aa4e1c71f6098faa95da619
+  metadata.gz: a182cddff92e3dc3bca871c4be88be1e0f002177
+  data.tar.gz: c29d49a12780c7b9ff509b5037876e19fc8ccef2
 SHA512:
-  metadata.gz: 53b4d004ecced81ba05f11e3b95ef68309ea8a1818125dc6e32b52538e2b848202035b2be1e55860d30731fa46db5e936202d087b7301ed3ba631ae063e7b72f
-  data.tar.gz: bfc762dda3aac9a4832ccf547e94884cc9fb4569c531a021351ae34a76ef3f96872e39c5d2c00376b6bbcb7a9ffab3bfd78e00a5361e082a00ff40c47b376042
+  metadata.gz: 0c10d7298396093557b605a604787cd4baf636f68f8a4dc3e77a9a41b88fac55a7e932c0c391db8ddbb002518560a2b58f1ffc9ca036fbee6b7674b81f37ba55
+  data.tar.gz: 3807971910e5519f6f87d17282c61e821e4b09a022c77f61c91b33ba9e2768ff6de583b5d241a03f2b2d3123d3932da36654fb3a203c41b9e196e1a89309a90d

data/ext/native/src/CMakeLists.txt

@@ -98,8 +98,8 @@ project (VirgilSecurity)
 # Set library version
 set (VIRGIL_VERSION_MAJOR 2)
 set (VIRGIL_VERSION_MINOR 1)
-set (VIRGIL_VERSION_PATCH 0)
-set (VIRGIL_VERSION_FEATURE dev)
+set (VIRGIL_VERSION_PATCH 2)
+set (VIRGIL_VERSION_FEATURE)
 set (VIRGIL_VERSION ${VIRGIL_VERSION_MAJOR}.${VIRGIL_VERSION_MINOR}.${VIRGIL_VERSION_PATCH})
 set (VIRGIL_SOVERSION 2)
 
@@ -109,7 +109,7 @@ else (VIRGIL_VERSION_FEATURE)
     set (VIRGIL_VERSION_FULL_NAME ${VIRGIL_VERSION})
 endif (VIRGIL_VERSION_FEATURE)
 
-message (STATUS "Virgil version: " ${VIRGIL_VERSION})
+message (STATUS "Virgil version: " ${VIRGIL_VERSION_FULL_NAME})
 message (STATUS "Virgil soversion: " ${VIRGIL_SOVERSION})
 
 # Configure path to custom modules

data/ext/native/src/ChangeLog

@@ -1,5 +1,63 @@
 virgil ChangeLog (Sorted per date)
 
+= Version 2.1.2 released 2017-03-22
+
+## Bugfix
+
+  [Build] Fix MSVC build by updating underlying MbedTLS library to the version: mbedtls-2.4.2-virgil-2.0.3
+
+
+= Version 2.1.1 released 2017-03-22
+
+## Bugfix
+
+  [Lib] Fix: Got unexpected error when process encrypted private key and omit password
+  [Lib] Update to mbed TLS version 2.4.2
+
+
+= Version 2.1.0 released 2017-03-16
+
+## Bugfix
+
+  [OSX] Add minimum required OSX version (Yosemite)
+  [Lib] Fix extra compiler warnings and documentation warnings
+
+## Changes
+
+  [OSX] Add minimum required OSX version (Yosemite)
+
+## Features
+
+  [CI] Add Dockerfile with Golang environment
+  [Lib] Expose low level API for targets that use C/C++ headers
+  [Lib] Add AES-128 to the symmetric cipher
+
+
+= Version 2.0.7 released 2017-03-06
+
+## Bugfix
+
+  * [Doc] Fix doxygen warnings
+
+
+= Version 2.0.6 released 2017-02-24
+
+## Features
+
+  * [Ruby] Add support for ruby versions: 2.2, 2.3, 2.4
+
+
+= Version 2.0.5 released 2017-02-20
+
+## Bugfix
+
+  * [Ruby] Fix linkage issue - link Ruby wrapper to the native Ruby ruby library
+
+## Changes
+
+  * [Ruby] Add flag '-autorename' for Ruby Swig wrapper, which apply Ruby naming conventions
+
+
 = Version 2.0.4 released 2017-01-10
 
 ## Bugfix

data/ext/native/src/Dockerfile_Golang

@@ -0,0 +1,41 @@
+FROM ubuntu:16.04
+
+# gcc for cgo
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    g++ \
+    gcc \
+    libc6-dev \
+    make \
+    pkg-config \
+    cmake \
+    swig \
+    doxygen \
+    curl \
+    ca-certificates \
+    git \
+    && rm -rf /var/lib/apt/lists/*
+
+# install golang
+ENV GOLANG_VERSION 1.7.5
+ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
+ENV GOLANG_DOWNLOAD_SHA256 2e4dd6c44f0693bef4e7b46cc701513d74c3cc44f2419bf519d7868b12931ac3
+
+RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
+    && echo "$GOLANG_DOWNLOAD_SHA256  golang.tar.gz" | sha256sum -c - \
+    && tar -C /usr/local -xzf golang.tar.gz \
+    && rm golang.tar.gz
+
+ENV GOPATH /go
+ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
+
+RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
+WORKDIR $GOPATH
+
+# build virgil-crypto-go
+ADD . virgil-crypto
+RUN cd virgil-crypto \
+    && cmake -H. -B_build -DCMAKE_INSTALL_PREFIX=_install -DLANG=go -DINSTALL_CORE_LIBS=ON \
+    && cmake --build _build --target install \
+    && go get -d gopkg.in/virgilsecurity/virgil-crypto-go.v4 \
+    && cp -r _install/* $GOPATH/src/gopkg.in/virgilsecurity/virgil-crypto-go.v4 \
+    && cd - && rm -rf virgil-crypto

data/ext/native/src/Jenkinsfile

@@ -41,7 +41,18 @@ def createNativeUnixBuild(slave) {
             // C++
             sh './utils/build.sh cpp'
             // Ruby
-            sh './utils/build.sh ruby'
+            withEnv(["PATH=${env.HOME}/.rbenv/bin:${env.PATH}"]){
+                writeFile file: './utils/env.sh', text: ['eval "$(rbenv init -)"'].join("\n")
+                writeFile file: '.ruby-version', text: ['2.0.0-p648'].join("\n")
+                sh './utils/build.sh ruby-2.0'
+                writeFile file: '.ruby-version', text: ['2.2.6'].join("\n")
+                sh './utils/build.sh ruby-2.2'
+                writeFile file: '.ruby-version', text: ['2.3.3'].join("\n")
+                sh './utils/build.sh ruby-2.3'
+                writeFile file: '.ruby-version', text: ['2.4.0'].join("\n")
+                sh './utils/build.sh ruby-2.4'
+            }
+            organizeFilesUnix('install/ruby')
             // Python
             if (slave.contains('centos7')) {
                 sh './utils/build.sh python-2.7'

data/ext/native/src/VERSION

@@ -1 +1 @@
-2.1.0-dev
+2.1.2

data/ext/native/src/cmake/find_host_utils.cmake

@@ -52,3 +52,9 @@ if (NOT COMMAND find_host_library)
         find_library (${ARGN})
     endmacro ()
 endif ()
+
+if (NOT COMMAND find_host_path)
+    macro (find_host_path)
+        find_path (${ARGN})
+    endmacro ()
+endif ()

data/ext/native/src/cmake/virgil_depends_local.cmake

@@ -128,7 +128,7 @@ function (virgil_depends_create_cache_file cache_path)
     # Pass compiler flags if not toolchain case
     if (NOT CMAKE_CROSSCOMPILING)
         string (TOUPPER "${CMAKE_BUILD_TYPE}" configuration)
-        foreach (lang C CXX)
+        foreach (lang ASM C CXX)
             virgil_depends_write_cache_var ("${cache_path}" "CMAKE_${lang}_COMPILER")
             virgil_depends_write_cache_var ("${cache_path}" "CMAKE_${lang}_FLAGS")
             virgil_depends_write_cache_var ("${cache_path}" "CMAKE_${lang}_FLAGS_${configuration}")

data/ext/native/src/lib/include/CMakeLists.txt

@@ -53,11 +53,9 @@ else ()
         PATTERN "*.h"
         PATTERN "cms" EXCLUDE
         PATTERN "internal" EXCLUDE
-        PATTERN "VirgilOID.h" EXCLUDE
         PATTERN "VirgilAsn1Reader.h" EXCLUDE
         PATTERN "VirgilAsn1Writer.h" EXCLUDE
         PATTERN "VirgilKDF.h" EXCLUDE
-        PATTERN "PolarsslException.h" EXCLUDE
         PATTERN "VirgilKeyPairGenerator.h" EXCLUDE
         PATTERN "VirgilSymmetricCipher.h" EXCLUDE
         PATTERN "VirgilAsymmetricCipher.h" EXCLUDE

data/ext/native/src/lib/include/virgil/crypto/VirgilCipherBase.h

@@ -136,9 +136,6 @@ public:
      *     for future decription in secure form.
      */
     ///@{
-    /**
-     * @brief Returns encrypted data info.
-     */
     /**
      * @brief Return content info.
      *
@@ -225,9 +222,6 @@ protected:
      * @note cipher's input vector is randomly generated.
      */
     virgil::crypto::foundation::VirgilSymmetricCipher& initEncryption();
-    /**
-     * @brief Configures symmetric cipher for encryption.
-     */
     /**
      * @brief Configures symmetric cipher for decryption.
      * @param encryptedDataInfo - serialized encrypted data info.

data/ext/native/src/lib/include/virgil/crypto/VirgilCryptoError.h

@@ -46,7 +46,7 @@ namespace virgil { namespace crypto {
 
 /**
  * @brief Specific error codes for the crypto library.
- * @ingroup Error
+ * @ingroup error
 */
 enum class VirgilCryptoError  {
     Reserved = 0, ///< Should not be used.
@@ -71,7 +71,7 @@ enum class VirgilCryptoError  {
 
 /**
  * @brief This is specific error category that contains information about crypto library errors.
- * @ingroup Error
+ * @ingroup error
  */
 class VirgilCryptoErrorCategory : public std::error_category {
 public:
@@ -92,7 +92,7 @@ public:
 /**
  * @brief Return singleton instance of the crypto error category.
  * @return Instance of the crypto error categoty.
- * @ingroup Error
+ * @ingroup error
  */
 const VirgilCryptoErrorCategory& crypto_category() noexcept;
 
@@ -101,7 +101,7 @@ const VirgilCryptoErrorCategory& crypto_category() noexcept;
  * @param ev Error value.
  * @return Exception with given error value and corresond error category.
  * @see VirgilCryptoError for specific error values.
- * @ingroup Error
+ * @ingroup error
  */
 inline VirgilCryptoException make_error(VirgilCryptoError ev) {
     return VirgilCryptoException(static_cast<int>(ev), crypto_category());
@@ -113,7 +113,7 @@ inline VirgilCryptoException make_error(VirgilCryptoError ev) {
  * @param what Additional error description.
  * @return Exception with given error value and corresond error category.
  * @see VirgilCryptoError for specific error values.
- * @ingroup Error
+ * @ingroup error
  */
 inline VirgilCryptoException make_error(VirgilCryptoError ev, const std::string& what) {
     return VirgilCryptoException(static_cast<int>(ev), crypto_category(), what);
@@ -125,7 +125,7 @@ inline VirgilCryptoException make_error(VirgilCryptoError ev, const std::string&
  * @param what Additional error description.
  * @return Exception with given error value and corresond error category.
  * @see VirgilCryptoError for specific error values.
- * @ingroup Error
+ * @ingroup error
  */
 inline VirgilCryptoException make_error(VirgilCryptoError ev, const char* what) {
     return VirgilCryptoException(static_cast<int>(ev), crypto_category(), what);

data/ext/native/src/lib/include/virgil/crypto/VirgilCryptoException.h

@@ -49,7 +49,7 @@ namespace virgil { namespace crypto {
  * To determine the real exception reason, error codes with conjuction with error category are used.
  * Error codes can be found in the enumeration @link VirgilCryptoError @endlink.
  *
- * @ingroup Error
+ * @ingroup error
  */
 class VirgilCryptoException : public std::exception {
 public:

data/ext/native/src/lib/include/virgil/crypto/VirgilKeyPair.h

@@ -228,7 +228,8 @@ public:
     /**
      * @brief Convert given private key to the PEM format.
      *
-     * @param publicKey - Private Key to be converted.
+     * @param privateKey - Private Key to be converted.
+     * @param privateKeyPassword - password for the Private Key.
      * @return Private Key in the PEM fromat.
      * @throw VirgilCryptoException, with VirgilCryptoError::InvalidPrivateKeyPassword if password is wrong.
      * @throw VirgilCryptoException, with VirgilCryptoError::InvalidFormat if key has invalid format.
@@ -239,7 +240,8 @@ public:
     /**
      * @brief Convert given private key to the DER format.
      *
-     * @param publicKey - Private Key to be converted.
+     * @param privateKey - Private Key to be converted.
+     * @param privateKeyPassword - password for the Private Key.
      * @return Private Key in the DER fromat.
      * @throw VirgilCryptoException, with VirgilCryptoError::InvalidPrivateKeyPassword if password is wrong.
      * @throw VirgilCryptoException, with VirgilCryptoError::InvalidFormat if key has invalid format.

data/ext/native/src/lib/include/virgil/crypto/VirgilStreamCipher.h

@@ -57,7 +57,6 @@ public:
      * @param embedContentInfo - determines whether to embed content info the the encrypted data, or not.
      * @note Store content info to use it for decription process, if embedContentInfo parameter is false.
      * @see getContentInfo()
-     * @return encrypted data.
      */
     void encrypt(VirgilDataSource& source, VirgilDataSink& sink, bool embedContentInfo = true);
 

data/ext/native/src/lib/include/virgil/crypto/foundation/VirgilHash.h

@@ -47,7 +47,7 @@ namespace virgil { namespace crypto { namespace foundation {
 
 /**
  * @brief Provides hashing (message digest) algorithms.
- * @ingroup Hash
+ * @ingroup hash
  */
 class VirgilHash : public virgil::crypto::foundation::asn1::VirgilAsn1Compatible {
 public:
@@ -91,12 +91,9 @@ public:
      */
     explicit VirgilHash(const char* name);
     ///@}
-    /**
-     * @brief
-     */
     /**
      * @name Info
-     * @brief Provide detail information about object.
+     * Provide detail information about object.
      */
     ///@{
     /**
@@ -114,7 +111,7 @@ public:
 
     /**
      * @name Immediate Hashing
-     * @brief This methods can be used to get the message hash immediately.
+     * This methods can be used to get the message hash immediately.
      */
     ///@{
     /**
@@ -131,7 +128,7 @@ public:
     /**
      * @name Chain Hashing
      *
-     * @brief This methods provide mechanism to hash long message,
+     * This methods provide mechanism to hash long message,
      *     that can be splitted to a shorter chunks and be processed separately.
      */
     ///@{
@@ -147,22 +144,22 @@ public:
      * This method MAY be called multiple times to process long message splitted to a shorter chunks.
      *
      * @param data - message to be hashed.
-     * @see @link start() @endlink
+     * @see start()
      */
     void update(const virgil::crypto::VirgilByteArray& data);
 
     /**
      * @brief Return final message hash.
      * @return Message hash processed by series of @link update() @endlink method.
-     * @see @link start() @endlink
-     * @see @link update() @endlink
+     * @see start()
+     * @see update()
      */
     virgil::crypto::VirgilByteArray finish();
     ///@}
 
     /**
      * @name HMAC Immediate Hashing
-     * @brief This methods can be used to get the message HMAC hash immediately.
+     * This methods can be used to get the message HMAC hash immediately.
      */
     ///@{
     /**
@@ -182,7 +179,7 @@ public:
     /**
      * @name HMAC Chain Hashing
      *
-     * @brief This methods provide mechanism to get HMAC hash of the long message,
+     * This methods provide mechanism to get HMAC hash of the long message,
      *     that can be splitted to a shorter chunks and be processed separately.
      */
     ///@{
@@ -253,7 +250,7 @@ namespace std {
 /**
  * @brief Returns string representation of the Hash algorithm.
  * @return Hash algorithm as string.
- * @ingroup Hash
+ * @ingroup hash
  */
 string to_string(virgil::crypto::foundation::VirgilHash::Algorithm alg);
 }

data/ext/native/src/lib/include/virgil/crypto/foundation/VirgilKDF.h

@@ -47,7 +47,7 @@ namespace virgil { namespace crypto { namespace foundation {
 
 /**
  * @brief Provides key derivation function algorithms.
- * @ingroup KDF
+ * @ingroup kdf
  */
 class VirgilKDF : public asn1::VirgilAsn1Compatible {
 public:
@@ -86,12 +86,9 @@ public:
      */
     explicit VirgilKDF(const char* name);
     ///@}
-    /**
-     * @brief
-     */
     /**
      * @name Info
-     * @brief Provide detail information about object.
+     * Provide detail information about object.
      */
     ///@{
     /**
@@ -167,7 +164,7 @@ namespace std {
 /**
  * @brief Returns string representation of the KDF algorithm.
  * @return KDF algorithm as string.
- * @ingroup KDF
+ * @ingroup kdf
  */
 string to_string(virgil::crypto::foundation::VirgilKDF::Algorithm alg);
 }

data/ext/native/src/lib/include/virgil/crypto/foundation/VirgilPBE.h

@@ -47,7 +47,7 @@ namespace virgil { namespace crypto { namespace foundation {
 
 /**
  * @brief Provides Password-Based Cryptography. Now PKCS#5 and PKCS#12 are partially supported.
- * @ingroup Cipher
+ * @ingroup cipher
  */
 class VirgilPBE : public asn1::VirgilAsn1Compatible {
 public:

data/ext/native/src/lib/include/virgil/crypto/foundation/VirgilPBKDF.h

@@ -82,12 +82,9 @@ public:
      */
     VirgilPBKDF(const virgil::crypto::VirgilByteArray& salt, unsigned int iterationCount = kIterationCount_Default);
     ///@}
-    /**
-     * @brief
-     */
     /**
      * @name Configuration / Info
-     * @brief Provide methods that allow precise algorithm configuration and get information about it.
+     * Provide methods that allow precise algorithm configuration and get information about it.
      */
     ///@{
     /**

data/ext/native/src/lib/include/virgil/crypto/foundation/VirgilRandom.h

@@ -57,14 +57,12 @@ public:
      * @brief Initialize randomization module with personalization data.
      *
      * @param personalInfo (@see section 8.7.1 of NIST Special Publication 800-90A).
-     * @return Random bytes.
      */
     explicit VirgilRandom(const virgil::crypto::VirgilByteArray& personalInfo);
     /**
      * @brief Initialize randomization module with personalization data.
      *
      * @param personalInfo (@see section 8.7.1 of NIST Special Publication 800-90A).
-     * @return Random bytes.
      */
     explicit VirgilRandom(const std::string& personalInfo);
     ///@}

data/ext/native/src/lib/include/virgil/crypto/foundation/VirgilSymmetricCipher.h

@@ -47,7 +47,7 @@ namespace virgil { namespace crypto { namespace foundation {
 
 /**
  * @brief Provides symmetric ciphers algorithms.
- * @ingroup Cipher
+ * @ingroup cipher
  */
 class VirgilSymmetricCipher : public virgil::crypto::foundation::asn1::VirgilAsn1Compatible {
 public:
@@ -70,6 +70,8 @@ public:
      * Enumerates possible Symmetric Cipher algorithms.
      */
     enum class Algorithm {
+        AES_128_CBC, ///< Cipher algorithm: AES-128, mode: CBC
+        AES_128_GCM, ///< Cipher algorithm: AES-128, mode: GCM
         AES_256_CBC, ///< Cipher algorithm: AES-256, mode: CBC
         AES_256_GCM  ///< Cipher algorithm: AES-256, mode: GCM
     };
@@ -297,7 +299,7 @@ namespace std {
 /**
  * @brief Returns string representation of the Hash algorithm.
  * @return Symmetric cipher algorithm as string.
- * @ingroup Cipher
+ * @ingroup cipher
  */
 string to_string(virgil::crypto::foundation::VirgilSymmetricCipher::Algorithm alg);
 }

data/ext/native/src/lib/include/virgil/crypto/foundation/VirgilSystemCryptoError.h

@@ -45,7 +45,7 @@ namespace virgil { namespace crypto { namespace foundation {
 
 /**
  * @brief Error category that handles error codes from the system crypto library.
- * @ingroup Error
+ * @ingroup error
  */
 class VirgilSystemCryptoErrorCategory : public std::error_category {
 public:
@@ -66,7 +66,7 @@ public:
 /**
  * @brief Return singleton instance of the system crypto error category.
  * @return Instance of the syste, crypto error categoty.
- * @ingroup Error
+ * @ingroup error
  */
 const VirgilSystemCryptoErrorCategory& system_crypto_category() noexcept;
 
@@ -79,7 +79,7 @@ const VirgilSystemCryptoErrorCategory& system_crypto_category() noexcept;
  * @param result Value returned by system crypto library.
  * @return Value if it's not an error.
  * @throw VirgilCryptoException with given error code and correspond category, if given value represents an error.
- * @ingroup Error
+ * @ingroup error
  */
 inline int system_crypto_handler_get_result(int result) {
     if (result >= 0) { return result; }
@@ -94,7 +94,7 @@ inline int system_crypto_handler_get_result(int result) {
  *
  * @param result Value returned by system crypto library.
  * @throw VirgilCryptoException with given error code and correspond category, if given value represents an error.
- * @ingroup Error
+ * @ingroup error
  */
 inline void system_crypto_handler(int result) {
     (void) system_crypto_handler_get_result(result);
@@ -113,7 +113,7 @@ inline void system_crypto_handler(int result) {
  * @param catch_handler Function that can handle the error in a different way.
  *
  * @return Value if it's not an error.
- * @ingroup Error
+ * @ingroup error
  */
 template<typename CatchHandler>
 inline int system_crypto_handler_get_result(int result, CatchHandler catch_handler) {
@@ -137,7 +137,7 @@ inline int system_crypto_handler_get_result(int result, CatchHandler catch_handl
  *
  * @param result Value returned by system crypto library.
  * @param catch_handler Function that can handle the error in a different way.
- * @ingroup Error
+ * @ingroup error
  */
 template<typename CatchHandler>
 inline void system_crypto_handler(int result, CatchHandler catch_handler) {

data/ext/native/src/lib/include/virgil/crypto/foundation/asn1/VirgilAsn1Writer.h

@@ -55,14 +55,14 @@ class VirgilAsn1Writer {
 public:
     /**
      * @brief Initialize internal state for the first use.
-     * @see @link reset @endlink method for reusing this class to create new ASN.1 stucture.
+     * @see reset() method for reusing this class to create new ASN.1 stucture.
      */
     VirgilAsn1Writer();
 
     /**
      * @brief Initialize internal state for the first use.
      * @param capacity - expected ASN.1 final size
-     * @see @link reset @endlink method for reusing this class to create new ASN.1 stucture.
+     * @see reset() method for reusing this class to create new ASN.1 stucture.
      */
     VirgilAsn1Writer(size_t capacity);
 

data/ext/native/src/lib/mainpage.dox

@@ -36,25 +36,25 @@
  */
 
 /**
- * @defgroup Error
+ * @defgroup error Error
  *
  * @brief This group contains interfaces for error handling mechanism that is used in the library.
  */
 
 /**
- * @defgroup Hash
+ * @defgroup hash Hash
  *
  * @brief This group contains interfaces for producing cryptographic hashes.
  */
 
 /**
- * @defgroup KDF
+ * @defgroup kdf KDF
  *
  * @brief This group contains interfaces to Key Derivation Function algorithms.
  */
 
 /**
- * @defgroup Cipher
+ * @defgroup cipher Cipher
  *
  * @brief This group contains interfaces to encryption and to decryption algorithms.
  */

data/ext/native/src/lib/src/VirgilAsymmetricCipher.cxx

@@ -226,7 +226,7 @@ static VirgilByteArray fixKey(const VirgilByteArray& key) {
     if (std::search(key.begin(), key.end(), pemHeaderBegin.begin(), pemHeaderBegin.end()) != key.end()) {
         VirgilByteArray fixedKey(key.begin(), key.end());
         fixedKey.push_back(0);
-        return std::move(fixedKey);
+        return fixedKey;
     }
     return key;
 }

data/ext/native/src/lib/src/VirgilSymmetricCipher.cxx

@@ -342,6 +342,10 @@ void VirgilSymmetricCipher::asn1Read(VirgilAsn1Reader& asn1Reader) {
 
 std::string std::to_string(virgil::crypto::foundation::VirgilSymmetricCipher::Algorithm alg) {
     switch (alg) {
+        case VirgilSymmetricCipher::Algorithm::AES_128_CBC:
+            return "AES-128-CBC";
+        case VirgilSymmetricCipher::Algorithm::AES_128_GCM:
+            return "AES-128-GCM";
         case VirgilSymmetricCipher::Algorithm::AES_256_CBC:
             return "AES-256-CBC";
         case VirgilSymmetricCipher::Algorithm::AES_256_GCM:

data/ext/native/src/lib/src/VirgilTinyCipher.cxx

@@ -178,7 +178,7 @@ static size_t calc_master_package_payload_size(size_t packageSize, size_t public
 /**
  * @brief Produce additional authenticated data for AEAD cipher.
  *
- * @param packageCount- package count
+ * @param packageCount - package count
  * @param ephemeralContext - asymmetric cipher context that handles ephemeral public key
  * @param isSigned - defines that package is signed
  */
@@ -188,7 +188,7 @@ static VirgilByteArray
 /**
  * @brief Read header from the package and parse it.
  *
- * @param[inout] packageIt - current parse position in the package
+ * @param[in,out] packageIt - current parse position in the package
  * @param[in] end - end of the package
  * @param[out] isMaster - defines that package is master
  * @param[out] isSigned - defines that package is signed
@@ -412,9 +412,9 @@ void VirgilTinyCipher::encryptAndSign(
             throw make_error(VirgilCryptoError::InvalidState, "Package size overflow.");
         }
 
-        const size_t spaceLeft = impl_->packageSize - package.size();
+        const std::ptrdiff_t spaceLeft = impl_->packageSize - package.size();
         const std::ptrdiff_t payloadAvailable = encryptedData.end() - payloadIt;
-        const size_t payloadSize = spaceLeft > payloadAvailable ? (size_t) payloadAvailable : spaceLeft;
+        const std::ptrdiff_t payloadSize = spaceLeft > payloadAvailable ? payloadAvailable : spaceLeft;
         package.insert(package.end(), payloadIt, payloadIt + payloadSize);
         payloadIt += payloadSize;
 

data/ext/native/src/libs_ext/mbedtls/mbedtls.cmake

@@ -89,8 +89,8 @@ endif ()
 
 ExternalProject_Add (${PROJECT_NAME}
     DOWNLOAD_DIR "@VIRGIL_DEPENDS_PACKAGE_DOWNLOAD_DIR@"
-    URL "https://github.com/VirgilSecurity/mbedtls/archive/mbedtls-2.4.0-virgil-2.0.1.tar.gz"
-    URL_HASH SHA1=8fe17bd30e644cefffdb2811c51c0e603e00e09b
+    URL "https://github.com/VirgilSecurity/mbedtls/archive/mbedtls-2.4.2-virgil-2.0.3.tar.gz"
+    URL_HASH SHA1=98a836e2030b6e00c9f0dab7b0e81ee37e395e57
     PREFIX "@VIRGIL_DEPENDS_PACKAGE_BUILD_DIR@"
     CMAKE_ARGS "@VIRGIL_DEPENDS_CMAKE_ARGS@" "${MBEDTLS_CMAKE_ARGS}"
     UPDATE_COMMAND ${CMAKE_COMMAND} -E copy_directory

data/ext/native/src/tests/test_asymmetric_cipher.cxx

@@ -68,6 +68,22 @@ static const char* const kPrivateKey1 =
                 "qS/jikzHqj7JwTOgmgSMhVzzOsJhXTD5Tp4M1gbz\n"
                 "-----END EC PRIVATE KEY-----\n";
 
+static const char* const kPrivateKey1DER =
+        "3081DB0201010441009E17CF991D24E4"
+                "BE392799B659A12341C679AE66C93CB7"
+                "2BB61DD7E7DA0BD9B27D3D9B3E659EC5"
+                "0B499270E967CEFB1E6F8AE0D8FDA4DE"
+                "8F7777E7CD09CBBCE0A00B06092B2403"
+                "03020801010DA1818503818200045955"
+                "E0E67649AC5A689924B3B9913CBCDB3F"
+                "DCFB2B4196932AE070E9D3DDCA0F0D64"
+                "C5034E36A1C66E783F5E2F396E82C3A3"
+                "EDAD7D1AE774D9A904C2D2011046964F"
+                "C77EFCAD956632792CC18FA72DC62B5D"
+                "F0467661EC11B8257A20CC89216224CA"
+                "A92FE38A4CC7AA3EC9C133A09A048C85"
+                "5CF33AC2615D30F94E9E0CD606F3";
+
 static const char* const kMalformedPrivateKey1 =
         "-----BEGIN EC PRIVATE KEY-----\n"
                 "MIHbAgEBBEEAnhfPmR0k5L45J5m2WaEjQcZ5rmbJPLcrth3X59oL2bJ9PZs+ZZ7F\n"
@@ -96,6 +112,27 @@ static const char* const kPrivateKey2 =
                 "sMaFiu8OBbyVfjhr9g==\n"
                 "-----END ENCRYPTED PRIVATE KEY-----\n";
 
+static const char* const kPrivateKey2DER =
+        "308201293034060A2A864886F70D010C"
+                "0103302604209D8267D5C3EFDB1EE2C5"
+                "8EF33681F28A0A91FD4847F7329A6A31"
+                "347D297B6CC2020220000481F073EA64"
+                "D31E8DDCE3B0F78B26B2E3D525DD112F"
+                "053948160DB22114B9BFE86DE5782362"
+                "FFBB1C8083B0A2893F7F9A842F7C9D1E"
+                "86D7718AEBE4BB65AF9A3906C48110B0"
+                "4024AA1429C5A6BBC02E6F4DEFFF021E"
+                "4CDB1587103FE269F9920B3A070269E7"
+                "DA0E0EFD18AA944016C310B1725A5E37"
+                "8F556A4A2EC0C0A284FC59AD2CE5C7CF"
+                "B5444DCD45101BB08E6A43783C5D3531"
+                "7807604B2F73FCA05C8FD05072013F00"
+                "5557B6F1DE5215D710F2E5608D8017DD"
+                "10477C96E4DA233775E58EDA868A0003"
+                "D2B55833C486DAB4825F231B9BD26D9F"
+                "8109A30D778DFE1A4B27A3873DA01919"
+                "B0C6858AEF0E05BC957E386BF6";
+
 static const char* const kMalformedPrivateKey2 =
         "-----BEGIN ENC PRIVATE KEY-----\n"
                 "MIIBKTA0BgoqhkiG9w0BDAEDMCYEIJ2CZ9XD79se4sWO8zaB8ooKkf1IR/cymmox\n"
@@ -127,10 +164,14 @@ TEST_CASE("Asymmetric Cipher - Keys Validation", "[asymmetric-cipher]") {
         REQUIRE_FALSE(VirgilAsymmetricCipher::checkPrivateKeyPassword(
                 str2bytes(kPrivateKey2), str2bytes(kWrongPwdPrivateKey2)));
     }
-    SECTION("check if private key is encrypted") {
+    SECTION("check if private key is encrypted (PEM)") {
         REQUIRE(VirgilAsymmetricCipher::isPrivateKeyEncrypted(str2bytes(kPrivateKey2)));
         REQUIRE_FALSE(VirgilAsymmetricCipher::isPrivateKeyEncrypted(str2bytes(kPrivateKey1)));
     }
+    SECTION("check if private key is encrypted (DER)") {
+        REQUIRE(VirgilAsymmetricCipher::isPrivateKeyEncrypted(hex2bytes(kPrivateKey2DER)));
+        REQUIRE_FALSE(VirgilAsymmetricCipher::isPrivateKeyEncrypted(hex2bytes(kPrivateKey1DER)));
+    }
     SECTION("check malformed private key throws") {
         REQUIRE_THROWS(VirgilAsymmetricCipher::checkPrivateKeyPassword(str2bytes(kMalformedPrivateKey2),
                 str2bytes(kPwdPrivateKey2)));

data/ext/native/src/tests/test_symmetric_cipher.cxx

@@ -53,10 +53,11 @@ using virgil::crypto::VirgilByteArray;
 using virgil::crypto::foundation::VirgilSymmetricCipher;
 using virgil::crypto::foundation::VirgilRandom;
 
-TEST_CASE("Symmetric Cipher", "[symmetric-cipher]") {
-    VirgilSymmetricCipher cipher(VirgilSymmetricCipher::Algorithm::AES_256_GCM);
+static void test_symmetric_cipher(VirgilSymmetricCipher::Algorithm algorithm) {
     VirgilByteArray plainData = str2bytes("data to be encrypted with symmetric cipher");
 
+    VirgilSymmetricCipher cipher(algorithm);
+
     SECTION("with known KEY and IV") {
         // Init keys
         VirgilByteArray key = hex2bytes("194122b1bee2f8c25ea5e0f02b1a3376d3a3dd1252365a2acefabead3cf6ab4c");
@@ -103,3 +104,20 @@ TEST_CASE("Symmetric Cipher", "[symmetric-cipher]") {
         REQUIRE(bytes2str(plainData) == bytes2str(decryptedData));
     }
 }
+
+TEST_CASE("Symmetric Cipher", "[symmetric-cipher]") {
+
+    SECTION("AES-128-CBC") {
+        test_symmetric_cipher(VirgilSymmetricCipher::Algorithm::AES_128_CBC);
+    }
+    SECTION("AES-256-CBC") {
+        test_symmetric_cipher(VirgilSymmetricCipher::Algorithm::AES_256_CBC);
+    }
+    SECTION("AES-128-GCM") {
+        test_symmetric_cipher(VirgilSymmetricCipher::Algorithm::AES_128_GCM);
+    }
+    SECTION("AES-256-GCM") {
+        test_symmetric_cipher(VirgilSymmetricCipher::Algorithm::AES_256_GCM);
+    }
+
+}

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

@@ -239,6 +239,11 @@ show_info "<install_dir>: ${INSTALL_DIR}"
 # Define common build parameters
 CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Release"
 
+if [[ ${TARGET_NAME} =~ ^(cpp|osx|ios|appletvos|applewatchos)$ ]]; then
+    # Expose low level API for targets that use C/C++ headers
+    CMAKE_ARGS+=" -DLIB_LOW_LEVEL_API=ON"
+fi
+
 if [[ ${TARGET_NAME} =~ ^(cpp|osx|java|net|php|python|ruby|nodejs|go)$ ]]; then
     CMAKE_ARGS+=" -DPLATFORM_ARCH=$(uname -m)"
 fi
@@ -266,6 +271,11 @@ if [[ ${TARGET_NAME} =~ ^(cpp|java|net|php|python|ruby|nodejs|go)$ ]]; then
 fi
 
 if [ "${TARGET_NAME}" == "osx" ]; then
+    # Add minimim OSX version flag
+    osx_version_min="10.10" # Yosemite
+    CMAKE_ARGS+=" -DCMAKE_ASM_FLAGS=-mmacosx-version-min=${osx_version_min}"
+    CMAKE_ARGS+=" -DCMAKE_C_FLAGS=-mmacosx-version-min=${osx_version_min}"
+    CMAKE_ARGS+=" -DCMAKE_CXX_FLAGS=-mmacosx-version-min=${osx_version_min}"
     # Build
     cmake ${CMAKE_ARGS} -DLANG=cpp -DPLATFORM=${TARGET_NAME} -DPLATFORM_VERSION=${SYSTEM_KERNEL_RELEASE_VERSION} "${SRC_DIR}"
     make -j4 install

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

@@ -42,7 +42,36 @@ 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})
 
-find_host_package (Ruby REQUIRED)
+# Find Ruby package
+if (LANG_VERSION)
+    find_host_package (Ruby "${LANG_VERSION}" EXACT REQUIRED)
+else ()
+    find_host_package (Ruby REQUIRED)
+endif (LANG_VERSION)
+
+# Find Ruby headers in given path - not system
+find_host_path (RUBY_INCLUDE_DIR_LOCAL
+    NAMES ruby.h
+    HINTS
+    ${RUBY_HDR_DIR}
+    ${RUBY_ARCH_DIR}
+    NO_DEFAULT_PATH
+)
+
+find_host_path (RUBY_CONFIG_INCLUDE_DIR_LOCAL
+    NAMES ruby/config.h  config.h
+    HINTS
+    ${RUBY_HDR_DIR}/${RUBY_ARCH}
+    ${RUBY_ARCH_DIR}
+    ${RUBY_ARCHHDR_DIR}
+    NO_DEFAULT_PATH
+)
+
+# Replace system ruby include dirs with found within RbConfig
+set (RUBY_INCLUDE_DIRS
+    "${RUBY_INCLUDE_DIR_LOCAL}" "${RUBY_CONFIG_INCLUDE_DIR_LOCAL}"
+    CACHE STRING "Ruby include directories" FORCE
+)
 include_directories (SYSTEM ${RUBY_INCLUDE_DIRS})
 
 if (RUBY_VERSION)

data/lib/virgil/crypto/version.rb

@@ -1,5 +1,5 @@
 module Virgil
   module Crypto
-    VERSION = '2.1.2'
+    VERSION = '2.1.2.1'
   end
 end

data/lib/virgil/crypto/virgil_stream_data_sink.rb

@@ -43,7 +43,7 @@ module Virgil
       end
 
       def is_good
-        !stream.closed_write?
+        !stream.closed?
       end
 
       def write(data)

data/lib/virgil/crypto/virgil_stream_data_source.rb

@@ -44,7 +44,7 @@ module Virgil
       end
 
       def has_data
-        !stream.closed_read? && !stream.eof?
+        !stream.closed? && !stream.eof?
       end
 
       def read

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virgil-crypto
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.2.1
 platform: ruby
 authors:
 - Dmitriy Dudkin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - ext/native/src/.travis.yml
 - ext/native/src/CMakeLists.txt
 - ext/native/src/ChangeLog
+- ext/native/src/Dockerfile_Golang
 - ext/native/src/Jenkinsfile
 - ext/native/src/LICENSE
 - ext/native/src/README.md
@@ -978,7 +979,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Virgil Crypto library wrapper