diff --git a/.travis.yml b/.travis.yml index 1cc06b2..f8ee63d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ script: # Build with carthage - if [ $PUBLISH_CARTHAGE == "YES" ]; then - brew update && brew upgrade carthage; + brew outdated || brew upgrade carthage; carthage build --no-skip-current; carthage archive; fi diff --git a/Cartfile b/Cartfile index a7ef551..4c3c7ff 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ github "VirgilSecurity/virgil-sdk-x" ~> 5.7 -github "VirgilSecurity/virgil-crypto-x" ~> 5.0.0-alpha2 \ No newline at end of file +github "VirgilSecurity/virgil-crypto-x" ~> 5.0.0-alpha5 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index 2f92c58..6e38de1 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ -github "VirgilSecurity/virgil-crypto-c" "v0.6.0" -github "VirgilSecurity/virgil-crypto-x" "5.0.0-alpha2" -github "VirgilSecurity/virgil-cryptoapi-x" "1.0.5" -github "VirgilSecurity/virgil-cryptowrapper-x" "0.6.0" -github "VirgilSecurity/virgil-sdk-x" "5.7.2" +github "VirgilSecurity/virgil-crypto-c" "v0.8.0" +github "VirgilSecurity/virgil-crypto-x" "5.0.0-alpha5" +github "VirgilSecurity/virgil-cryptoapi-x" "1.0.6" +github "VirgilSecurity/virgil-cryptowrapper-x" "0.8.0" +github "VirgilSecurity/virgil-sdk-x" "5.8.0" diff --git a/README.md b/README.md index 694412f..9593d43 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ To integrate Virgil Keyknox into your Xcode project using CocoaPods, specify it target '' do use_frameworks! - pod 'VirgilSDKKeyknox', '~> 0.4.1' + pod 'VirgilSDKKeyknox', '~> 0.4.2' end ``` @@ -71,7 +71,7 @@ $ brew install carthage To integrate Virgil Keyknox into your Xcode project using Carthage, create an empty file with name *Cartfile* in your project's root folder and add following lines to your *Cartfile* ``` -github "VirgilSecurity/virgil-keyknox-x" ~> 0.4.1 +github "VirgilSecurity/virgil-keyknox-x" ~> 0.4.2 ``` #### Linking against prebuilt binaries diff --git a/Source/Crypto/KeyknoxCrypto.swift b/Source/Crypto/KeyknoxCrypto.swift index f4f9e03..2aea9d5 100644 --- a/Source/Crypto/KeyknoxCrypto.swift +++ b/Source/Crypto/KeyknoxCrypto.swift @@ -133,7 +133,7 @@ extension KeyknoxCrypto: KeyknoxCryptoProtocol { cipher.setRandom(random: self.crypto.rng) publicKeys.forEach { - cipher.addKeyRecipient(recipientId: $0.identifier, publicKey: $0.publicKey) + cipher.addKeyRecipient(recipientId: $0.identifier, publicKey: $0.key) } cipher.customParams().addData(key: VirgilCrypto.CustomParamKeySignature, value: signature) diff --git a/VirgilSDKKeyknox.podspec b/VirgilSDKKeyknox.podspec index 579a9e2..ce597a3 100644 --- a/VirgilSDKKeyknox.podspec +++ b/VirgilSDKKeyknox.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "VirgilSDKKeyknox" - s.version = "0.4.1" + s.version = "0.4.2" s.license = { :type => "BSD", :file => "LICENSE" } s.summary = "Virgil Keyknox SDK for Apple devices and languages." s.homepage = "https://github.com/VirgilSecurity/virgil-keyknox-x/" @@ -12,5 +12,5 @@ Pod::Spec.new do |s| s.watchos.deployment_target = "2.0" s.source_files = 'Source/**/*.{swift}' s.dependency "VirgilSDK", "~> 5.7" - s.dependency "VirgilCrypto", "~> 5.0.0-alpha2" + s.dependency "VirgilCrypto", "~> 5.0.0-alpha5" end diff --git a/VirgilSDKKeyknox/Info.plist b/VirgilSDKKeyknox/Info.plist index 026deee..fb0e09b 100644 --- a/VirgilSDKKeyknox/Info.plist +++ b/VirgilSDKKeyknox/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.4.1 + 0.4.2 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass