Skip to content

Commit

Permalink
Merge branch 'release/v2.6.4'
Browse files Browse the repository at this point in the history 
Changes:

  * [Ruby] Dropped version 2.0.0-p648
  * [Ruby] Dropped version 2.2.6
  * [Ruby] Dropped version 2.3.3
  * [Ruby] Dropped version 2.4.0
  * [Ruby] Added version 2.5.8
  * [Ruby] Added version 2.6.6
  * [Ruby] Added version 2.7.1

  * [NodeJS] Dropped version 6
  * [NodeJS] Dropped version 8
  * [NodeJS] Dropped version 11
  * [NodeJS] Update version 10.9.0 -> 10.21.0

  * [PHP] Dropped version 7.1
  * [PHP] Added version 7.4

  * [Python] Dropped version 3.4
  • Loading branch information
@SergeySeroshtan
SergeySeroshtan committed Jul 3, 2020
2 parents ac65cfd + 7f07ace commit 6a8f44c
Show file tree
Hide file tree
Showing 8 changed files with 351 additions and 47 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ project (VirgilSecurity)
# Set library version
set (VIRGIL_VERSION_MAJOR 2)
set (VIRGIL_VERSION_MINOR 6)
set (VIRGIL_VERSION_PATCH 3)
set (VIRGIL_VERSION_PATCH 4)
set (VIRGIL_VERSION_TAG)
set (VIRGIL_VERSION ${VIRGIL_VERSION_MAJOR}.${VIRGIL_VERSION_MINOR}.${VIRGIL_VERSION_PATCH})
set (VIRGIL_SOVERSION 2)
Expand Down
23 changes: 23 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
virgil ChangeLog (Sorted per date)

= Version 2.6.4 released 2020-07-04

## Changes

* [Ruby] Dropped version 2.0.0-p648
* [Ruby] Dropped version 2.2.6
* [Ruby] Dropped version 2.3.3
* [Ruby] Dropped version 2.4.0
* [Ruby] Added version 2.5.8
* [Ruby] Added version 2.6.6
* [Ruby] Added version 2.7.1

* [NodeJS] Dropped version 6
* [NodeJS] Dropped version 8
* [NodeJS] Dropped version 11
* [NodeJS] Update version 10.9.0 -> 10.21.0

* [PHP] Dropped version 7.1
* [PHP] Added version 7.4

* [Python] Dropped version 3.4


= Version 2.6.3 released 2019-05-14

## Changes
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile_Golang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ RUN wget https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSION}.ta
&& rm -rf ./cmake-*

# install golang
ENV GOLANG_VERSION 1.12.5
ENV GOLANG_VERSION 1.12.10
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 aea86e3c73495f205929cfebba0d63f1382c8ac59be081b6351681415f4063cf
ENV GOLANG_DOWNLOAD_SHA256 aaa84147433aed24e70b31da369bb6ca2859464a45de47c2a5023d8573412f6b

RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \
Expand Down
63 changes: 22 additions & 41 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ stage 'Build'
def slaves = [:]
slaves['native-centos7'] = createNativeUnixBuild('build-centos7');
slaves['native-os-x'] = createNativeUnixBuild('build-os-x');
slaves['native-win8'] = createNativeWindowsBuild('build-win8');
slaves['native-win10'] = createNativeWindowsBuild('build-win10');
slaves['crossplatform'] = createCrossplatfromBuild('build-os-x');
slaves['darwin'] = createDarwinBuild('build-os-x');
slaves['android'] = createAndroidBuild('build-os-x');
Expand Down Expand Up @@ -43,14 +43,12 @@ def createNativeUnixBuild(slave) {
// 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 --target=ruby-2.0'
writeFile file: '.ruby-version', text: ['2.2.6'].join("\n")
sh './utils/build.sh --target=ruby-2.2'
writeFile file: '.ruby-version', text: ['2.3.3'].join("\n")
sh './utils/build.sh --target=ruby-2.3'
writeFile file: '.ruby-version', text: ['2.4.0'].join("\n")
sh './utils/build.sh --target=ruby-2.4'
writeFile file: '.ruby-version', text: ['2.5.8'].join("\n")
sh './utils/build.sh --target=ruby-2.5'
writeFile file: '.ruby-version', text: ['2.6.6'].join("\n")
sh './utils/build.sh --target=ruby-2.6'
writeFile file: '.ruby-version', text: ['2.7.1'].join("\n")
sh './utils/build.sh --target=ruby-2.7'
}
organizeFilesUnix('install/ruby')
// Python
Expand All @@ -76,7 +74,6 @@ def createNativeUnixBuild(slave) {
}
if (slave.contains('build-os-x')) {
sh './utils/build.sh --target=python-2.7'
sh './utils/build.sh --target=python-3.4'
sh './utils/build.sh --target=python-3.5'
sh './utils/build.sh --target=python-3.6'
sh './utils/build.sh --target=python-3.7'
Expand All @@ -85,29 +82,24 @@ def createNativeUnixBuild(slave) {
// Java
sh './utils/build.sh --target=java'
// NodeJS
sh './utils/build.sh --target=nodejs-6.14.4'
sh './utils/build.sh --target=nodejs-8.12.0'
sh './utils/build.sh --target=nodejs-10.9.0'
sh './utils/build.sh --target=nodejs-11.1.0'
sh './utils/build.sh --target=nodejs-10.21.0'
organizeFilesUnix('install/nodejs')
// PHP
if (slave.contains('os-x')) {
def phpVersions = "php [email protected] [email protected] [email protected]"
sh "brew unlink ${phpVersions} && brew link [email protected] --force"
sh "./utils/build.sh --target=php-7.1"
def phpVersions = "php [email protected] [email protected] [email protected]"
sh "brew unlink ${phpVersions} && brew link [email protected] --force"
sh "./utils/build.sh --target=php-7.2"
sh "brew unlink ${phpVersions} && brew link [email protected] --force"
sh "./utils/build.sh --target=php-7.3"
sh "brew unlink ${phpVersions} && brew link [email protected] --force"
sh "./utils/build.sh --target=php-7.4"
organizeFilesUnix('install/php')
}
if (slave.contains('centos7')) {
writeFile file: './utils/env.sh', text: ['source /opt/remi/php71/enable', ''].join("\n")
sh './utils/build.sh --target=php-7.1'
writeFile file: './utils/env.sh', text: ['source /opt/remi/php72/enable', 'source /opt/rh/devtoolset-4/enable', ''].join("\n")
sh './utils/build.sh --target=php-7.2'
writeFile file: './utils/env.sh', text: ['source /opt/remi/php73/enable', 'source /opt/rh/devtoolset-4/enable', ''].join("\n")
sh './utils/build.sh --target=php-7.3'
writeFile file: './utils/env.sh', text: ['source /opt/remi/php74/enable', 'source /opt/rh/devtoolset-4/enable', ''].join("\n")
sh './utils/build.sh --target=php-7.4'
organizeFilesUnix('install/php')
}
// MONO NET
Expand All @@ -127,33 +119,18 @@ def createNativeWindowsBuild(slave) {
node(slave) {
clearContentWindows()
unstash 'src'
withEnv(['MSVC_ROOT=C:\\Program Files (x86)\\Microsoft Visual Studio 14.0',
'JAVA_HOME=C:\\Program Files\\Java\\jdk1.8.0_65']) {
withEnv(["MSVC_ROOT=C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community",
"JAVA_HOME=C:\\Program Files\\Java\\jdk1.8.0_231"]) {
bat 'utils\\build.bat cpp'
bat 'utils\\build.bat net'
bat 'utils\\build.bat java'
bat 'utils\\build.bat nodejs-6.14.4'
bat 'utils\\build.bat nodejs-8.12.0'
bat 'utils\\build.bat nodejs-10.9.0'
bat 'utils\\build.bat nodejs-11.1.0'
bat 'utils\\build.bat nodejs-10.21.0'
withEnv(["PATH=C:\\Python27_x86;${env.PATH}"]) {
bat 'utils\\build.bat python-2.7-x86'
}
withEnv(["PATH=C:\\Python27_x64;${env.PATH}"]) {
bat 'utils\\build.bat python-2.7-x64'
}
withEnv(["PATH=C:\\Python33_x86;${env.PATH}"]) {
bat 'utils\\build.bat python-3.3-x86'
}
withEnv(["PATH=C:\\Python33_x64;${env.PATH}"]) {
bat 'utils\\build.bat python-3.3-x64'
}
withEnv(["PATH=C:\\Python34_x86;${env.PATH}"]) {
bat 'utils\\build.bat python-3.4-x86'
}
withEnv(["PATH=C:\\Python34_x64;${env.PATH}"]) {
bat 'utils\\build.bat python-3.4-x64'
}
withEnv(["PATH=C:\\Python35_x86;${env.PATH}"]) {
bat 'utils\\build.bat python-3.5-x86'
}
Expand All @@ -176,11 +153,15 @@ def createNativeWindowsBuild(slave) {
withEnv(["MSVC_ROOT=C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community",
"PHPUNIT_HOME=C:\\phpunit-7.2.4"]) {

withEnv(["PHP_HOME=C:\\php-7.2.18", "PHP_DEVEL_HOME=C:\\php-7.2.18-devel"]) {
withEnv(["PHP_HOME=C:\\php-7.2.28", "PHP_DEVEL_HOME=C:\\php-7.2.28-devel"]) {
bat 'utils\\build.bat php-7.2-x64'
}

withEnv(["PHP_HOME=C:\\php-7.3.5", "PHP_DEVEL_HOME=C:\\php-7.3.5-devel"]) {
withEnv(["PHP_HOME=C:\\php-7.3.15", "PHP_DEVEL_HOME=C:\\php-7.3.15-devel"]) {
bat 'utils\\build.bat php-7.3-x64'
}

withEnv(["PHP_HOME=C:\\php-7.4.3", "PHP_DEVEL_HOME=C:\\php-7.4.3-devel"]) {
bat 'utils\\build.bat php-7.3-x64'
}
}
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.3
2.6.4
2 changes: 1 addition & 1 deletion lib/include/virgil/crypto/VirgilCryptoError.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ enum class VirgilCryptoError {
InvalidState, ///< Function call prerequisite is broken.
InvalidAuth, ///< Invalid authentication.
MismatchSignature, ///< Signature validation failed.
NotFoundKeyRecipient, ///< Recipient with given identifier is not found.
NotFoundKeyRecipient, ///< Data was not encrypted for this recipient.
NotFoundPasswordRecipient, ///< Recipient with given password is not found.
NotInitialized, ///< Object is not initialized with specific algorithm, so can't be used.
NotSecure, ///< Security prerequisite is broken.
Expand Down
2 changes: 1 addition & 1 deletion lib/src/VirgilCryptoError.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ std::string VirgilCryptoErrorCategory::message(int ev) const noexcept {
case VirgilCryptoError::MismatchSignature:
return "Signature validation failed.";
case VirgilCryptoError::NotFoundKeyRecipient:
return "Recipient with given identifier is not found.";
return "Data was not encrypted for this recipient.";
case VirgilCryptoError::NotFoundPasswordRecipient:
return "Recipient with given password is not found.";
case VirgilCryptoError::NotInitialized:
Expand Down
Loading

0 comments on commit 6a8f44c

Please sign in to comment.