Merge pull request #30 from VirgilSecurity/develop

Develop

Author: SanjoDeundiak

.swiftlint.yml

@@ -67,8 +67,6 @@ opt_in_rules:
   - function_parameter_count
   - identical_operands
   - identifier_name
-  - implicit_getter
-  - implicit_return
   - inert_defer
   - is_disjoint
   - large_tuple

.travis.yml

@@ -1,22 +1,22 @@
 language: objective-c
-osx_image: xcode11.3
+osx_image: xcode11.4
 
 env:
   global:
     - LC_CTYPE=en_US.UTF-8
     - PROJECT=VirgilCrypto.xcodeproj
-    - IOS_SDK=iphonesimulator13.2
+    - IOS_SDK=iphonesimulator13.4
     - MACOS_SDK=macosx10.15
-    - TVOS_SDK=appletvsimulator13.2
-    - WATCHOS_SDK=watchsimulator6.1
+    - TVOS_SDK=appletvsimulator13.4
+    - WATCHOS_SDK=watchsimulator6.2
     - CRYPTO_FRAMEWORK_NAME=VirgilCrypto
     - REPO=VirgilSecurity/virgil-crypto-x
   matrix:
     - DESTINATION=""                                           PREFIX=""         SDK=""              BUILD="0"  PUBLISH_CARTHAGE="YES"  CARTHAGE_PLATFORM_NAME="Mac"      PUBLISH_POD="YES"  PUBLISH_DOCS="YES"  SWIFT_LINT="NO"
-    - DESTINATION="OS=13.3,name=iPhone 8"                      PREFIX="iOS"      SDK="$IOS_SDK"      BUILD="2"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="iOS"      PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
+    - DESTINATION="OS=13.4,name=iPhone 8"                      PREFIX="iOS"      SDK="$IOS_SDK"      BUILD="2"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="iOS"      PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
     - DESTINATION="arch=x86_64"                                PREFIX="macOS"    SDK="$MACOS_SDK"    BUILD="2"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="Mac"      PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
-    - DESTINATION="OS=13.2,name=Apple TV 4K"                   PREFIX="tvOS"     SDK="$TVOS_SDK"     BUILD="2"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="tvOS"     PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
-    - DESTINATION="OS=6.1.1,name=Apple Watch Series 4 - 44mm"  PREFIX="watchOS"  SDK="$WATCHOS_SDK"  BUILD="1"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="watchOS"  PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
+    - DESTINATION="OS=13.4,name=Apple TV 4K"                   PREFIX="tvOS"     SDK="$TVOS_SDK"     BUILD="2"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="tvOS"     PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
+    - DESTINATION="OS=6.2,name=Apple Watch Series 4 - 44mm"    PREFIX="watchOS"  SDK="$WATCHOS_SDK"  BUILD="1"  PUBLISH_CARTHAGE="NO"   CARTHAGE_PLATFORM_NAME="watchOS"  PUBLISH_POD="NO"   PUBLISH_DOCS="NO"   SWIFT_LINT="NO"
 
 before_install:
   - set -e

Cartfile

@@ -1 +1 @@
-github "VirgilSecurity/virgil-cryptowrapper-x" ~> 0.12.0
+github "VirgilSecurity/virgil-cryptowrapper-x" ~> 0.14.0

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "VirgilSecurity/virgil-crypto-c" "v0.12.0"
-github "VirgilSecurity/virgil-cryptowrapper-x" "0.12.0"
+github "VirgilSecurity/virgil-crypto-c" "v0.14.0"
+github "VirgilSecurity/virgil-cryptowrapper-x" "0.14.0"

README.md

@@ -112,7 +112,7 @@ To integrate VirgilCrypto into your Xcode project using CocoaPods, specify it in
 target '<Your Target Name>' do
   use_frameworks!
 
-  pod 'VirgilCrypto', '~> 5.3.0'
+  pod 'VirgilCrypto', '~> 5.4.0'
 end
 ```
 
@@ -136,7 +136,7 @@ $ brew install carthage
 To integrate VirgilCrypto 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-crypto-x" ~> 5.3.0
+github "VirgilSecurity/virgil-crypto-x" ~> 5.4.0
 ```
 
 #### Linking against prebuilt binaries

Source/KeyPairType+Convert.swift

@@ -59,6 +59,17 @@ extension KeyPairType {
             return
         }
 
+        if keyInfo.isHybrid() {
+            if keyInfo.hybridFirstKeyAlgId() == .curve25519 && keyInfo.hybridSecondKeyAlgId() == .round5Nd5kem5d {
+                self = .curve25519Round5
+            }
+            else {
+                throw VirgilCryptoError.unknownCompoundKey
+            }
+
+            return
+        }
+
         let algId = keyInfo.algId()
 
         if algId == .rsa {
@@ -88,22 +99,33 @@ extension KeyPairType {
             return .secp256r1
         case .rsa2048, .rsa4096, .rsa8192:
             return .rsa
-        case .curve25519Round5Ed25519Falcon, .curve25519Ed25519:
+        case .curve25519Round5Ed25519Falcon, .curve25519Ed25519, .curve25519Round5:
             throw VirgilCryptoError.compundKeyShouldBeGeneratedDirectly
         }
     }
 
+    internal var isHybrid: Bool {
+        switch self {
+        case .curve25519Ed25519, .curve25519Round5Ed25519Falcon, .curve25519Round5:
+            return true
+        case .curve25519, .ed25519, .rsa2048, .rsa4096, .rsa8192, .secp256r1:
+            return false
+        }
+    }
+
     internal var isCompound: Bool {
         switch self {
         case .curve25519Ed25519, .curve25519Round5Ed25519Falcon:
             return true
-        case .curve25519, .ed25519, .rsa2048, .rsa4096, .rsa8192, .secp256r1:
+        case .curve25519, .ed25519, .rsa2048, .rsa4096, .rsa8192, .secp256r1, .curve25519Round5:
             return false
         }
     }
 
     internal func getSignerKeysAlgIds() throws -> (first: AlgId, second: AlgId) {
         switch self {
+        case .curve25519Round5:
+            return (.none, .none)
         case .curve25519Ed25519:
             return (.ed25519, .none)
         case .curve25519Round5Ed25519Falcon:
@@ -117,7 +139,7 @@ extension KeyPairType {
         switch self {
         case .curve25519Ed25519:
             return (.curve25519, .none)
-        case .curve25519Round5Ed25519Falcon:
+        case .curve25519Round5Ed25519Falcon, .curve25519Round5:
             return (.curve25519, .round5Nd5kem5d)
         case .curve25519, .ed25519, .rsa2048, .rsa4096, .rsa8192, .secp256r1:
             throw VirgilCryptoError.keyIsNotCompound

Source/KeyPairType+String.swift

@@ -46,6 +46,7 @@ extension KeyPairType {
         case rsa2048
         case rsa4096
         case rsa8192
+        case curve25519Round5
         case curve25519Round5Ed25519Falcon
         case curve25519Ed25519
     }
@@ -67,11 +68,13 @@ extension KeyPairType {
             self = .rsa4096
         case KeyPairTypeStr.rsa8192.rawValue:
             self = .rsa8192
+        case KeyPairTypeStr.curve25519Round5.rawValue:
+            self = .curve25519Round5
         case KeyPairTypeStr.curve25519Round5Ed25519Falcon.rawValue:
             self = .curve25519Round5Ed25519Falcon
         case KeyPairTypeStr.curve25519Ed25519.rawValue:
             self = .curve25519Ed25519
-            
+
         default:
             throw VirgilCryptoError.unknownKeyType
         }
@@ -92,6 +95,8 @@ extension KeyPairType {
             return KeyPairTypeStr.rsa4096.rawValue
         case .rsa8192:
             return KeyPairTypeStr.rsa8192.rawValue
+        case .curve25519Round5:
+            return KeyPairTypeStr.curve25519Round5.rawValue
         case .curve25519Round5Ed25519Falcon:
             return KeyPairTypeStr.curve25519Round5Ed25519Falcon.rawValue
         case .curve25519Ed25519:

Source/KeyPairType.swift

@@ -44,13 +44,17 @@ import Foundation
 /// - rsa2048: rsa with 2048 length
 /// - rsa4096: rsa with 4096 length
 /// - rsa8192: rsa with 8192 length
+/// - curve25519Round5: curve25519 and round5
+/// - curve25519Round5Ed25519Falcon: ed25519 and falcon used for signing, curve25519 and round used for hybrid ECIES
+/// - curve25519Ed25519: ed25519 used for signing, curve25519 used for ECIES
 @objc(VSMKeyPairType) public enum KeyPairType: Int {
     case ed25519
     case curve25519
     case secp256r1
     case rsa2048
     case rsa4096
     case rsa8192
+    case curve25519Round5
     case curve25519Round5Ed25519Falcon
     case curve25519Ed25519
 }

Source/VirgilCrypto/VirgilCrypto+KeyGeneration.swift

@@ -69,6 +69,18 @@ extension VirgilCrypto {
                                                                           signerFirstKeyAlgId: signerKeysAlgIds.first,
                                                                           signerSecondKeyAlgId: signerKeysAlgIds.second)
         }
+        else if type.isHybrid {
+            let cipherKeysAlgIds = try type.getCipherKeysAlgIds()
+            let signerKeysAlgIds = try type.getSignerKeysAlgIds()
+
+            var ids = cipherKeysAlgIds
+
+            if cipherKeysAlgIds.first == .none && cipherKeysAlgIds.second == .none {
+                ids = signerKeysAlgIds
+            }
+
+            privateKey = try keyProvider.generateHybridPrivateKey(firstKeyAlgId: ids.first, secondKeyAlgId: ids.second)
+        }
         else {
             privateKey = try keyProvider.generatePrivateKey(algId: try type.getAlgId())
         }

Tests/VSM001_CryptoTests.swift

@@ -53,7 +53,7 @@ class VSM001_CryptoTests: XCTestCase {
         XCTAssert(keyPair.privateKey.identifier == keyPair.publicKey.identifier)
     }
 
-    private static let allKeyTypes: [KeyPairType] = [.curve25519, .ed25519, .secp256r1, .rsa2048, .curve25519Round5Ed25519Falcon, .curve25519Ed25519]
+    private static let allKeyTypes: [KeyPairType] = [.curve25519, .ed25519, .secp256r1, .rsa2048, .curve25519Round5Ed25519Falcon, .curve25519Ed25519, .curve25519Round5]
     private static let signingKeyTypes: [KeyPairType] = [.ed25519, .secp256r1, .rsa2048, .curve25519Round5Ed25519Falcon, .curve25519Ed25519]
 
     func test01__key_generation__generate_one_key__should_succeed() {