virgil-crypto 2.3.0 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56cd6a63a8188f6e3c3f7924973ed8865304e54868a623eef97e71a9c761e6e5
-  data.tar.gz: 49e5516c22d7730056aeb17351cd2f05abe315a15be438f1dd7f81e7021d53fd
+  metadata.gz: e7a8803e30898c0762202fa39472acf941058fa017999654de2134a280945974
+  data.tar.gz: 3b831be8eb3704a6506109aeb3100d015ccdb658b440eaa482db13034ca526c3
 SHA512:
-  metadata.gz: 524c89b24568757b9433bb6ab0cfc13136b144d25d2c5acf41480dcc808642d4c4913667d66778868b021e348df6d2d398be3539d3aaddd30d70ce8e0222ec35
-  data.tar.gz: f2deabacf1ffa18bd555a80ae53cfc64b2c4e4affe6331ffe8a6de95f6b6aa0584bee77fc4829e035cef420867c4fd8d3e54f5817433b87569cb65b32b8f842d
+  metadata.gz: 5969d567e6f7beccdaf7f455f897f1586572917049a066abcdb604548ec2d076806a42f1bc0ff93cc656f8b87925aa344d5070d45b139f4da60540fa745dc720
+  data.tar.gz: 3d3ef03d4ab7b3e21e9cd04f3dcffa2aea1bbc6af8daa5ea28001aacc26cd7f55453b068f1997c06a53d9e1f0973bdf1b8ae6b5f8e7657d1547e6106bdd81d2b

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+branches:
+  only:
+    - master
+before_install:
+  - openssl aes-256-cbc -K $encrypted_a30fbaed9b64_key -iv $encrypted_a30fbaed9b64_iv -in secrets.tar.enc -out secrets.tar -d
+  - tar xvf secrets.tar
+  - rvm install 2.4.1
+
+rvm:
+- 2.4.1
+script:
+- rake

data/README.md

@@ -1,24 +1,128 @@
-# Virgil Crypto Library wrapper
+# Virgil Security Ruby Crypto Library
+[![Build Status](https://travis-ci.org/VirgilSecurity/virgil-crypto-ruby.svg?branch=master)](https://travis-ci.org/VirgilSecurity/virgil-crypto-ruby)
+[![Gem](https://img.shields.io/gem/v/virgil-crypto.svg)](https://rubygems.org/gems/virgil-crypto)
+[![GitHub license](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg)](https://github.com/VirgilSecurity/virgil/blob/master/LICENSE)
+[![Documentation YARD](https://img.shields.io/badge/docs-yard-blue.svg)](https://virgilsecurity.github.io/virgil-crypto-ruby)
 
-This gem implements Ruby wrapper for [Virgil Crypto](https://github.com/VirgilSecurity/virgil-crypto).
-# Installation and usage 
-To install the latest gem version run:
+### [Introduction](#introduction) | [Library purposes](#library-purposes) | [Usage examples](#usage-examples) | [Installation](#installation) | [Docs](#docs) | [License](#license) | [Contacts](#support)
 
+## Introduction
+VirgilCrypto is a stack of security libraries (ECIES with Crypto Agility wrapped in Virgil Cryptogram) and an open-source high-level [cryptographic library](https://github.com/VirgilSecurity/virgil-crypto) that allows you to perform all necessary operations for securely storing and transferring data in your digital solutions. Crypto Library is written in C++ and is suitable for mobile and server platforms.
+
+Virgil Security, Inc., guides software developers into the forthcoming security world in which everything will be encrypted (and passwords will be eliminated). In this world, the days of developers having to raise millions of dollars to build a secure chat, secure email, secure file-sharing, or a secure anything have come to an end. Now developers can instead focus on building features that give them a competitive market advantage while end-users can enjoy the privacy and security they increasingly demand.
+
+## Library purposes
+* Asymmetric Key Generation
+* Encryption/Decryption of data and streams
+* Generation/Verification of digital signatures
+* PFS (Perfect Forward Secrecy)
+
+## Usage examples
+
+#### Generate a key pair
+
+Generate a Private Key with the default algorithm (EC_X25519):
+```ruby
+require 'virgil/crypto'
+include Virgil::Crypto
+
+crypto = VirgilCrypto.new
+key_pair = crypto.generate_keys
+```
+
+#### Generate and verify a signature
+
+Generate signature and sign data with a private key:
+```ruby
+require 'virgil/crypto'
+include Virgil::Crypto
+
+crypto = VirgilCrypto.new
+
+# prepare a message
+message_to_sign = 'Hello, Bob!'
+data_to_sign = Bytes.from_string(message_to_sign)
+
+# generate a signature
+signature = crypto.generate_signature(data_to_sign, sender_private_key)
 ```
-gem install virgil-crypto
+
+Verify a signature with a public key:
+```ruby
+require 'virgil/crypto'
+include Virgil::Crypto
+
+crypto = VirgilCrypto.new
+
+# verify a signature
+verified = crypto.verify_signature(signature, data_to_sign, sender_public_key)
 ```
 
-or add the following line to your Gemfile:
+#### Encrypt and decrypt data
+
+Encrypt Data on a Public Key:
+
+```ruby
+require 'virgil/crypto'
+include Virgil::Crypto
+
+crypto = VirgilCrypto.new
 
+# prepare a message
+message_to_encrypt = 'Hello, Bob!'
+data_to_encrypt = Bytes.from_string(message_to_encrypt)
+
+# encrypt the message
+encrypted_data = crypto.encrypt(data_to_encrypt, receiver_public_key)
 ```
-gem 'virgil-crypto', '~> 2.3.0'
+
+Decrypt the encrypted data with a Private Key:
+```ruby
+require 'virgil/crypto'
+include Virgil::Crypto
+
+crypto = VirgilCrypto.new
+
+# prepare data to be decrypted
+decrypted_data = crypto.decrypt(encrypted_data, receiver_private_key)
+
+# decrypt the encrypted data using a private key
+decrypted_message = Bytes.new(decrypted_data).to_s
 ```
+      
+Need more examples? Visit our [developer documentation](https://developer.virgilsecurity.com/docs/how-to#cryptography).
 
+## Installation
+
+TThe Virgil Crypto is provided as a [gem](https://rubygems.org/) named [*virgil-crypto*](https://rubygems.org/gems/virgil-crypto) and available for Ruby 2.1 and newer. The package is distributed via *bundler* package manager.
+ 
+ To install the package use the command below:
+ 
+ ```
+ gem install virgil-crypto
+ ```
+ 
+ or add the following line to your Gemfile:
+ 
+ ```
+ gem 'virgil-crypto', '~> 3.6.2'
+ ```
 and then run
 
 ```
 bundle
 ```
+## Docs
+- [Crypto Core Library](https://github.com/VirgilSecurity/virgil-crypto)
+- [More usage examples](https://developer.virgilsecurity.com/docs/how-to#cryptography)
+
+## License
+
+This library is released under the [3-clause BSD License](https://github.com/VirgilSecurity/virgil-sdk-javascript/blob/master/LICENSE).
+
+## Support
+Our developer support team is here to help you. Find out more information on our [Help Center](https://help.virgilsecurity.com/).
+
+You can find us on [Twitter](https://twitter.com/VirgilSecurity) or send us email support@VirgilSecurity.com.
 
-# Usage
-Use this crypto with [Virgil SDK](https://github.com/VirgilSecurity/virgil-sdk-ruby) that will provide you to create an secure application using Virgil Security services.
+Also, get extra help from our support team on [Slack](https://virgilsecurity.com/join-community).

data/ext/native/src/.clang-format

@@ -0,0 +1,37 @@
+---
+Language:        Cpp
+BasedOnStyle:    LLVM
+Standard:        Cpp11
+TabWidth:        4
+UseTab:          Never
+ColumnLimit:     120
+IndentWidth:     4
+ConstructorInitializerIndentWidth: 8
+ContinuationIndentWidth: 8
+AllowShortFunctionsOnASingleLine : false
+DerivePointerAlignment: false
+PointerAlignment: Left
+AlignAfterOpenBracket: AlwaysBreak
+AccessModifierOffset: -4
+AllowAllParametersOfDeclarationOnNextLine: true
+BinPackArguments: true
+BinPackParameters: true
+AlwaysBreakBeforeMultilineStrings: true
+MaxEmptyLinesToKeep: 2
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+...

data/ext/native/src/.gitignore

@@ -15,3 +15,6 @@ profile
 
 #####
 .idea
+
+#####
+*.sublime-workspace

data/ext/native/src/.travis.yml

@@ -39,10 +39,10 @@ matrix:
 env:
   global:
     - VIRGIL_CRYPTO_FEATURE_LOW_LEVEL_WRAP=ON
+    - VIRGIL_CRYPTO_FEATURE_PYTHIA=ON
     - PROJECT_ROOT=${TRAVIS_BUILD_DIR}
     - CMAKE_VERSION=3.10.2
     - SWIG_VERSION=3.0.12
-    - DOXYGEN_VERSION=1.8.13
 cache:
   directories:
     - cmake-${CMAKE_VERSION}
@@ -67,6 +67,7 @@ install:
 before_script:
   - CMAKE_ARGS="-DLANG=${LANG} -DPLATFORM_ARCH=`uname -m`"
   - CMAKE_ARGS+=" -DVIRGIL_CRYPTO_FEATURE_LOW_LEVEL_WRAP=${VIRGIL_CRYPTO_FEATURE_LOW_LEVEL_WRAP}"
+  - CMAKE_ARGS+=" -DVIRGIL_CRYPTO_FEATURE_PYTHIA=${VIRGIL_CRYPTO_FEATURE_PYTHIA}"
   - CMAKE_ARGS+=" -DCMAKE_INSTALL_PREFIX=${PROJECT_ROOT}/install"
   - CMAKE_ARGS+=" -DLANG_VERSION=${LANG_VERSION}"
   - if [ "${LANG}" = "cpp" ]; then CMAKE_ARGS+=" -DVIRGIL_CRYPTO_FEATURE_STREAM_IMPL=ON"; fi

data/ext/native/src/CMakeLists.txt

@@ -41,7 +41,6 @@
 #     - PLATFORM            - name of target platform (optional).
 #     - PLATFORM_VERSION    - minimum supported version of the target platform (optional).
 #     - PLATFORM_ARCH       - target platform processor architecture (optional).
-#     - ADD_COMPILER_INFO   - define whether to add compiler info to the library full name (optional).
 #     - LIB_STATIC_RUNTIME  - сauses library to use the static version of the run-time library.
 #
 #     - BUILD_LIBRARY_FRAMEWORK - build library as Apple Framework.
@@ -72,18 +71,25 @@
 #           boolean value that defines whether to compile module that is
 #           depends on a C++ streams or not.
 #
+#     - VIRGIL_CRYPTO_FEATURE_PYTHIA -
+#           boolean value that defines whether to enable module Pythia or not.
+#
+#     - VIRGIL_CRYPTO_FEATURE_PYTHIA_MT -
+#           boolean value that defines whether to build module Pythia in a multi-threading mode.
+#
 # Define variables:
 #     - VIRGIL_VERSION           - library full version.
 #     - VIRGIL_VERSION_MAJOR     - library major version number.
 #     - VIRGIL_VERSION_MINOR     - library minor version number.
 #     - VIRGIL_VERSION_PATCH     - library patch number.
 #     - VIRGIL_SOVERSION         - library ABI version.
-#     - VIRGIL_VERSION_FEATURE   - library version feature, i.e. rc1, or coolfeature, etc.
+#     - VIRGIL_VERSION_TAG       - library version tag, i.e. rc1, or coolfeature, etc.
 #     - VIRGIL_VERSION_FULL_NAME - library version full name, i.e. 1.3.4-rc1
 #
-#     - POINTER_SIZE         - compiler pointer size.
+#     - VIRGIL_PACKAGE_NAME_FEATURES - add available features to the library package name.
+#     - VIRGIL_PACKAGE_NAME_COMPILER - add compiler info to the library package name.
 #
-#     - CMAKE_ARGS           - list of CMake parameters in form -DVAR:TYPE=VAL
+#     - POINTER_SIZE         - compiler pointer size.
 #
 # Optimizations:
 #     - ED25519_AMD64_OPTIMIZATION - boolean value that defines whether to enable AMD64 optimization
@@ -105,17 +111,17 @@ project (VirgilSecurity)
 
 # Set library version
 set (VIRGIL_VERSION_MAJOR 2)
-set (VIRGIL_VERSION_MINOR 3)
-set (VIRGIL_VERSION_PATCH 0)
-set (VIRGIL_VERSION_FEATURE)
+set (VIRGIL_VERSION_MINOR 4)
+set (VIRGIL_VERSION_PATCH 5)
+set (VIRGIL_VERSION_TAG)
 set (VIRGIL_VERSION ${VIRGIL_VERSION_MAJOR}.${VIRGIL_VERSION_MINOR}.${VIRGIL_VERSION_PATCH})
 set (VIRGIL_SOVERSION 2)
 
-if (VIRGIL_VERSION_FEATURE)
-    set (VIRGIL_VERSION_FULL_NAME ${VIRGIL_VERSION}-${VIRGIL_VERSION_FEATURE})
-else (VIRGIL_VERSION_FEATURE)
+if (VIRGIL_VERSION_TAG)
+    set (VIRGIL_VERSION_FULL_NAME ${VIRGIL_VERSION}-${VIRGIL_VERSION_TAG})
+else (VIRGIL_VERSION_TAG)
     set (VIRGIL_VERSION_FULL_NAME ${VIRGIL_VERSION})
-endif (VIRGIL_VERSION_FEATURE)
+endif (VIRGIL_VERSION_TAG)
 
 message (STATUS "Virgil version: " ${VIRGIL_VERSION_FULL_NAME})
 message (STATUS "Virgil soversion: " ${VIRGIL_SOVERSION})
@@ -123,6 +129,9 @@ message (STATUS "Virgil soversion: " ${VIRGIL_SOVERSION})
 # Configure path to custom modules
 set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
+# Define known toolchain arguments to be passed downstream.
+include (TransitiveToolchainArgs)
+
 # Build shared library if defined
 set (BUILD_SHARED_LIBS OFF CACHE BOOL "Force to create shared libraries")
 
@@ -133,8 +142,9 @@ else ()
     set (LIB_STATIC_RUNTIME OFF CACHE BOOL "Causes library to use the static version of the run-time library.")
 endif ()
 
-# Configure additional parameters for library full name
-set (ADD_COMPILER_INFO OFF CACHE BOOL "Define whether to add compiler info to the library full name")
+# Define package name options
+set (VIRGIL_PACKAGE_NAME_FEATURES OFF CACHE BOOL "Add available features to the library package name.")
+set (VIRGIL_PACKAGE_NAME_COMPILER OFF CACHE BOOL "Add compiler info to the library package name.")
 
 # Define COMPILER
 string (TOLOWER "${CMAKE_CXX_COMPILER_ID}" COMPILER_ID)
@@ -157,38 +167,8 @@ endif ()
 # Add find_host_* utilities
 include (find_host_utils)
 
-# Define possible cmake_args
-include (cmake_args)
-
-if (ANDROID)
-    append_cmake_arg (CMAKE_ARGS NAME PLATFORM_VERSION TYPE STRING)
-    append_cmake_arg (CMAKE_ARGS NAME ANDROID_NDK TYPE PATH)
-    append_cmake_arg (CMAKE_ARGS NAME ANDROID_ABI TYPE STRING)
-    append_cmake_arg (CMAKE_ARGS NAME ANDROID_NATIVE_API_LEVEL TYPE STRING)
-    append_cmake_arg (CMAKE_ARGS NAME ANDROID_TOOLCHAIN_NAME TYPE STRING)
-    append_cmake_arg (CMAKE_ARGS NAME ANDROID_FORCE_ARM_BUILD TYPE BOOL)
-    append_cmake_arg (CMAKE_ARGS NAME ANDROID_NO_UNDEFINED TYPE BOOL)
-    append_cmake_arg (CMAKE_ARGS NAME ANDROID_SO_UNDEFINED TYPE BOOL)
-    append_cmake_arg (CMAKE_ARGS NAME ANDROID_STL TYPE STRING)
-    append_cmake_arg (CMAKE_ARGS NAME ANDROID_STL_FORCE_FEATURES TYPE BOOL)
-endif (ANDROID)
-
-if (CMAKE_TOOLCHAIN_FILE AND APPLE)
-    append_cmake_arg (CMAKE_ARGS NAME APPLE_PLATFORM TYPE STRING)
-    append_cmake_arg (CMAKE_ARGS NAME APPLE_BITCODE TYPE BOOL)
-    append_cmake_arg (CMAKE_ARGS NAME APPLE_EXTENSION TYPE BOOL)
-    append_cmake_arg (CMAKE_ARGS NAME IOS_DEVICE_FAMILY TYPE STRING)
-    append_cmake_arg (CMAKE_ARGS NAME IOS_DEPLOYMENT_TARGET TYPE STRING)
-    append_cmake_arg (CMAKE_ARGS NAME WATCHOS_DEPLOYMENT_TARGET TYPE STRING)
-    append_cmake_arg (CMAKE_ARGS NAME WATCHOS_DEVICE_FAMILY TYPE STRING)
-    append_cmake_arg (CMAKE_ARGS NAME TVOS_DEPLOYMENT_TARGET TYPE STRING)
-    append_cmake_arg (CMAKE_ARGS NAME TVOS_DEVICE_FAMILY TYPE STRING)
-    append_cmake_arg (CMAKE_ARGS NAME MACOS_DEPLOYMENT_TARGET TYPE STRING)
-    append_cmake_arg (CMAKE_ARGS NAME CMAKE_APPLE_PLATFORM_DEVELOPER_ROOT TYPE PATH)
-    append_cmake_arg (CMAKE_ARGS NAME CMAKE_APPLE_SDK_ROOT TYPE PATH)
-endif ()
-
 # Define additional compiler flags
+# TODO: Review. Maybe redundant, because of option POSITION_INDEPENDENT_CODE=ON
 if (NOT CMAKE_CROSSCOMPILING)
     include (CheckCCompilerFlag)
     check_c_compiler_flag (-fPIC COMPILER_SUPPORT_PIC)
@@ -212,10 +192,19 @@ if (LIB_STATIC_RUNTIME)
     endforeach ()
 endif (LIB_STATIC_RUNTIME)
 
-# Define optimization features
-set (ED25519_AMD64_OPTIMIZATION ON CACHE BOOL "Defines whether to enable AMD64 optimization for Ed25519 algorithms")
+# Configure features
+set (VIRGIL_CRYPTO_FEATURE_LOW_LEVEL_WRAP OFF CACHE BOOL
+        "Defines whether to wrap low-level API or not")
+
+set (VIRGIL_CRYPTO_FEATURE_STREAM_IMPL ON CACHE BOOL
+        "Defines whether to compile module that is depends on a C++ stream or not")
+
+set (VIRGIL_CRYPTO_FEATURE_PYTHIA OFF CACHE BOOL "Defines whether to enable module Pythia or not")
+set (VIRGIL_CRYPTO_FEATURE_PYTHIA_MT ON CACHE BOOL "Defines whether to build module Pythia in a multi-threading mode")
 
 # Configure optimizations
+set (ED25519_AMD64_OPTIMIZATION ON CACHE BOOL "Defines whether to enable AMD64 optimization for Ed25519 algorithms")
+
 set (MBEDTLS_CMAKE_ARGS "")
 if (NOT CMAKE_CROSSCOMPILING AND ED25519_AMD64_OPTIMIZATION AND UNIX)
     if (NOT DEFINED CMAKE_OSX_ARCHITECTURES OR
@@ -233,24 +222,31 @@ include (virgil_depends)
 virgil_depends (
     PACKAGE_NAME "MbedTLS"
     CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libs_ext/mbedtls"
-    CMAKE_ARGS "${CMAKE_ARGS}" "${MBEDTLS_CMAKE_ARGS}"
+    CMAKE_ARGS "${MBEDTLS_CMAKE_ARGS}"
 )
 virgil_find_package (MbedTLS 2.4)
 
 virgil_depends (
     PACKAGE_NAME "RapidJSON"
     CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libs_ext/rapidjson"
-    CMAKE_ARGS "${CMAKE_ARGS}"
 )
 virgil_find_package (RapidJSON 1.1)
 
 virgil_depends (
     PACKAGE_NAME "tinyformat"
     CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libs_ext/tinyformat"
-    CMAKE_ARGS "${CMAKE_ARGS}"
 )
 virgil_find_package (tinyformat 2.0.1)
 
+if (VIRGIL_CRYPTO_FEATURE_PYTHIA)
+    virgil_depends (
+        PACKAGE_NAME "pythia"
+        CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libs_ext/pythia"
+    )
+    virgil_find_package (pythia 0.0.1)
+    virgil_find_package (relic 0.4.0)
+endif ()
+
 # Define enviroment parameters
 if (NOT DEFINED POINTER_SIZE)
     include (check_pointer_size)
@@ -276,19 +272,12 @@ set_property (CACHE LANG PROPERTY STRINGS
     "ruby"
 )
 
-# Configure features
-set (VIRGIL_CRYPTO_FEATURE_LOW_LEVEL_WRAP OFF CACHE BOOL
-        "Defines whether to wrap low-level API or not")
-
-set (VIRGIL_CRYPTO_FEATURE_STREAM_IMPL ON CACHE BOOL
-        "Defines whether to compile module that is depends on a C++ stream or not")
-
 # Configure crosscompiling
 set (UCLIBC OFF CACHE BOOL "Enable pathches if library is build with uClibc++")
 
 if (CMAKE_CROSSCOMPILING AND APPLE)
     string (TOLOWER "${APPLE_PLATFORM}" PLATFORM)
-    string (REPLACE "_sim" "" PLATFORM "${PLATFORM}")
+    string (REGEX REPLACE "_sim(32|64)?" "" PLATFORM "${PLATFORM}")
 
     set (PLATFORM ${PLATFORM} CACHE STRING "Target platform")
     set (PLATFORM_VERSION ${APPLE_DEPLOYMENT_TARGET} CACHE STRING "Minimum version of the platform")
@@ -302,16 +291,23 @@ if (CMAKE_CROSSCOMPILING AND APPLE)
     endif ()
 endif ()
 
+if (CMAKE_CROSSCOMPILING AND ANDROID)
+    set (PLATFORM_VERSION ${ANDROID_NATIVE_API_LEVEL} CACHE STRING "Android native API level")
+    set (PLATFORM_ARCH ${ANDROID_ABI} CACHE STRING "Target processor architecture")
+    set (PLATFORM_EMBEDDED YES CACHE BOOL "Mark target platform as embedded")
+endif ()
+
 # Configure testing
 set (ENABLE_TESTING ON CACHE BOOL "Defines whether include unit testing or not.")
 set (ENABLE_BENCHMARK OFF CACHE BOOL "Defines whether include benchmark or not.")
 
 # Configure path variables
-set (INSTALL_INC_DIR_NAME include CACHE STRING "Installation directory name for includes")
+include(GNUInstallDirs)
+set (INSTALL_INC_DIR_NAME ${CMAKE_INSTALL_INCLUDEDIR} CACHE STRING "Installation directory name for includes")
 set (INSTALL_LIB_DIR_NAME lib CACHE STRING "Installation directory name for libraries")
-set (INSTALL_BIN_DIR_NAME bin CACHE STRING "Installation directory name for executables")
-set (INSTALL_MAN_DIR_NAME "share/man" CACHE STRING "Installation directory name for man pages")
-set (INSTALL_DOC_DIR_NAME "share/doc" CACHE STRING "Installation directory name for doc pages")
+set (INSTALL_BIN_DIR_NAME ${CMAKE_INSTALL_BINDIR} CACHE STRING "Installation directory name for executables")
+set (INSTALL_MAN_DIR_NAME ${CMAKE_INSTALL_MANDIR} CACHE STRING "Installation directory name for man pages")
+set (INSTALL_DOC_DIR_NAME "${CMAKE_INSTALL_DATAROOTDIR}/doc" CACHE STRING "Installation directory name for doc pages")
 set (INSTALL_API_DIR_NAME api CACHE STRING "Installation directory name for interface files")
 
 # Configure platform specific path variables
@@ -406,11 +402,18 @@ if (PLATFORM_ARCH)
     set (LIB_NAME_FULL "${LIB_NAME_FULL}-${PLATFORM_ARCH}")
 endif (PLATFORM_ARCH)
 
-if (ADD_COMPILER_INFO)
+
+if (VIRGIL_PACKAGE_NAME_FEATURES)
+    if (VIRGIL_CRYPTO_FEATURE_PYTHIA)
+        set (LIB_NAME_FULL "${LIB_NAME_FULL}-pythia")
+    endif ()
+endif ()
+
+if (VIRGIL_PACKAGE_NAME_COMPILER)
     if (COMPILER AND COMPILER_VERSION)
         set (LIB_NAME_FULL "${LIB_NAME_FULL}-${COMPILER}-${COMPILER_VERSION}")
     else ()
-        message (FATAL_ERROR "ADD_COMPILER_INFO defined, but can not deduce compiler version.")
+        message (FATAL_ERROR "VIRGIL_PACKAGE_NAME_COMPILER defined, but can not deduce compiler version.")
     endif ()
 endif ()