Key Derivation
+Key Derivation
SwiftECC uses the X9.63 Key Derivation Function to derive block cipher keying materiel. Please refer [SEC 1] section 3.6. Six cases are considered: @@ -286,9 +353,9 @@ HMAC key = bytes 32 ..< 64 For block modes CBC, CFB, CTR, and OFB the initialization vector (IV) is 16 zero bytes. -Performance
+Performance
To assess the performance of SwiftECC, the signature generation and verification time and the keypair generation time -was measured on a MacBook Pro 2018, 2,2 GHz 6-Core Intel Core i7. The results are shown in the table below - units are milliseconds. The columns mean: +was measured on an iMac 2021, Apple M1 chip. The results are shown in the table below - units are milliseconds. The columns mean:- Sign: The time it takes to sign a short message
- Verify: The time it takes to verify a signature for a short message @@ -297,50 +364,50 @@ was measured on a MacBook Pro 2018, 2,2 GHz 6-Core Intel Core i7. The results ar
- [WARREN] - Henry S. Warren, Jr.: Montgomery Multiplication, July 2012
- [X9.62] - X9.62 - Public Key Cryptography For The Financial Services Industry, 1998
| Curve | Sign | Verify | Keypair Generation |
|---|---|---|---|
| brainpoolP160r1 | 1.4 mSec | 2.5 mSec | 5.1 mSec |
| brainpoolP160t1 | 1.4 mSec | 2.4 mSec | 5.1 mSec |
| brainpoolP192r1 | 1.7 mSec | 3.0 mSec | 6.3 mSec |
| brainpoolP192t1 | 1.7 mSec | 3.1 mSec | 6.4 mSec |
| brainpoolP224r1 | 2.3 mSec | 4.3 mSec | 9.4 mSec |
| brainpoolP224t1 | 2.3 mSec | 4.3 mSec | 9.4 mSec |
| brainpoolP256r1 | 2.7 mSec | 5.1 mSec | 11 mSec |
| brainpoolP256t1 | 2.7 mSec | 5.0 mSec | 11 mSec |
| brainpoolP320r1 | 4.2 mSec | 7.7 mSec | 18 mSec |
| brainpoolP320t1 | 4.2 mSec | 7.8 mSec | 18 mSec |
| brainpoolP384r1 | 6.0 mSec | 11 mSec | 27 mSec |
| brainpoolP384t1 | 6.1 mSec | 11 mSec | 27 mSec |
| brainpoolP512r1 | 11 mSec | 21 mSec | 52 mSec |
| brainpoolP512t1 | 11 mSec | 21 mSec | 52 mSec |
| secp192k1 | 1.6 mSec | 3.0 mSec | 6.2 mSec |
| secp192r1 | 1.6 mSec | 3.0 mSec | 6.3 mSec |
| secp224k1 | 2.3 mSec | 4.2 mSec | 9.5 mSec |
| secp224r1 | 2.3 mSec | 4.2 mSec | 9.4 mSec |
| secp256k1 | 2.7 mSec | 5.2 mSec | 11 mSec |
| secp256r1 | 2.7 mSec | 5.0 mSec | 11 mSec |
| secp384r1 | 6.1 mSec | 11 mSec | 27 mSec |
| secp521r1 | 11 mSec | 21 mSec | 51 mSec |
| sect163k1 | 1.9 mSec | 3.6 mSec | 7.8 mSec |
| sect163r2 | 1.9 mSec | 3.6 mSec | 7.9 mSec |
| sect233k1 | 3.5 mSec | 6.9 mSec | 15 mSec |
| sect233r1 | 3.5 mSec | 6.4 mSec | 15 mSec |
| sect283k1 | 5.3 mSec | 10 mSec | 25 mSec |
| sect283r1 | 5.3 mSec | 9.8 mSec | 25 mSec |
| sect409k1 | 11 mSec | 22 mSec | 57 mSec |
| sect409r1 | 11 mSec | 21 mSec | 58 mSec |
| sect571k1 | 23 mSec | 45 mSec | 126 mSec |
| sect571r1 | 23 mSec | 46 mSec | 126 mSec |
| brainpoolP160r1 | 0.7 mSec | 1.3 mSec | 2.9 mSec |
| brainpoolP160t1 | 0.7 mSec | 1.4 mSec | 2.9 mSec |
| brainpoolP192r1 | 0.96 mSec | 1.8 mSec | 3.9 mSec |
| brainpoolP192t1 | 0.96 mSec | 1.9 mSec | 3.9 mSec |
| brainpoolP224r1 | 1.3 mSec | 2.6 mSec | 5.7 mSec |
| brainpoolP224t1 | 1.3 mSec | 2.6 mSec | 5.7 mSec |
| brainpoolP256r1 | 1.7 mSec | 3.3 mSec | 7.4 mSec |
| brainpoolP256t1 | 1.7 mSec | 3.3 mSec | 7.4 mSec |
| brainpoolP320r1 | 2.9 mSec | 5.7 mSec | 13 mSec |
| brainpoolP320t1 | 2.9 mSec | 5.5 mSec | 13 mSec |
| brainpoolP384r1 | 4.5 mSec | 8.6 mSec | 21 mSec |
| brainpoolP384t1 | 4.4 mSec | 8.7 mSec | 21 mSec |
| brainpoolP512r1 | 9.2 mSec | 19 mSec | 44 mSec |
| brainpoolP512t1 | 9.3 mSec | 18 mSec | 44 mSec |
| secp192k1 | 0.96 mSec | 1.8 mSec | 4.0 mSec |
| secp192r1 | 0.96 mSec | 1.9 mSec | 3.9 mSec |
| secp224k1 | 1.3 mSec | 2.6 mSec | 5.8 mSec |
| secp224r1 | 1.3 mSec | 2.6 mSec | 5.7 mSec |
| secp256k1 | 1.7 mSec | 3.2 mSec | 7.4 mSec |
| secp256r1 | 1.7 mSec | 3.3 mSec | 7.5 mSec |
| secp384r1 | 4.5 mSec | 8.9 mSec | 21 mSec |
| secp521r1 | 9.8 mSec | 19 mSec | 47 mSec |
| sect163k1 | 1.2 mSec | 2.2 mSec | 5.1 mSec |
| sect163r2 | 1.2 mSec | 2.3 mSec | 5.1 mSec |
| sect233k1 | 2.3 mSec | 4.5 mSec | 11 mSec |
| sect233r1 | 2.3 mSec | 4.5 mSec | 11 mSec |
| sect283k1 | 3.5 mSec | 7.0 mSec | 17 mSec |
| sect283r1 | 3.5 mSec | 7.1 mSec | 17 mSec |
| sect409k1 | 8.0 mSec | 16 mSec | 41 mSec |
| sect409r1 | 8.0 mSec | 16 mSec | 42 mSec |
| sect571k1 | 17 mSec | 35 mSec | 92 mSec |
| sect571r1 | 17 mSec | 34 mSec | 92 mSec |
Dependencies
+Dependencies
The SwiftECC package depends on the ASN1 and BigInt packages dependencies: [ .package(url: "https://github.com/leif-ibsen/ASN1", from: "2.0.0"), - .package(url: "https://github.com/leif-ibsen/BigInt", from: "1.2.6"), + .package(url: "https://github.com/leif-ibsen/BigInt", from: "1.2.11"), ], -References
+References
Algorithms from the following books and papers have been used in the implementation. There are references in the source code where appropriate. @@ -358,5 +425,5 @@ There are references in the source code where appropriate.Acknowledgement
+Acknowledgement
The AES block cipher implementation is essentially a translation to Swift of the Go Language implementation of AES. diff --git a/Sources/SwiftECC/Base64.swift b/Sources/SwiftECC/Base64.swift index 80ae920..b94f2d1 100755 --- a/Sources/SwiftECC/Base64.swift +++ b/Sources/SwiftECC/Base64.swift @@ -10,8 +10,7 @@ /// Base64 exists to provide a namespace. It contains static functions for Base64 encoding and decoding. /// public struct Base64 { - - static let linesize = 76 + static let base64chars = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", @@ -31,7 +30,7 @@ public struct Base64 { /// - pem: The PEM header- and footer string /// - Returns: The Base64 PEM encoding of *input* public static func pemEncode(_ input: Bytes, _ pem: String) -> String { - return "-----BEGIN " + pem + "-----\n" + encode(input) + "\n-----END " + pem + "-----" + return "-----BEGIN " + pem + "-----\n" + encode(input, 64) + "\n-----END " + pem + "-----" } /// PEM decodes a string @@ -56,8 +55,9 @@ public struct Base64 { /// /// - Parameters: /// - input: Bytes to encode + /// - linesize: Number of characters per line - 76 is default /// - Returns: The Base64 encoding of *input* - public static func encode(_ input: Bytes) -> String { + public static func encode(_ input: Bytes, _ linesize: Int = 76) -> String { var base64 = "" var i = 0 var k = 0 diff --git a/Sources/SwiftECC/Cipher/MD.swift b/Sources/SwiftECC/Cipher/MD.swift index a619b45..5021351 100755 --- a/Sources/SwiftECC/Cipher/MD.swift +++ b/Sources/SwiftECC/Cipher/MD.swift @@ -5,13 +5,17 @@ // Created by Leif Ibsen on 05/01/2020. // -// -// Message digest interface to the SHA2 MD's -// -enum MessageDigestAlgorithm: String { +/// +/// Message digest algorithms +/// +public enum MessageDigestAlgorithm: CaseIterable { + /// SHA2 224 case SHA2_224 + /// SHA2 256 case SHA2_256 + /// SHA2 384 case SHA2_384 + /// SHA2 512 case SHA2_512 } diff --git a/Sources/SwiftECC/Domain.swift b/Sources/SwiftECC/Domain.swift index 93dcb28..4aaa9fd 100755 --- a/Sources/SwiftECC/Domain.swift +++ b/Sources/SwiftECC/Domain.swift @@ -235,12 +235,16 @@ public class Domain: CustomStringConvertible, Equatable { /// - cofactor: The cofactor /// - oid: An optional domain OID /// - Returns: The domain - /// - Throws: A *domainParameter* exception if 4 * a^3 + 27 * b^2 = 0 + /// - Throws: A *domainParameter* exception if 4 * a^3 + 27 * b^2 = 0 or the generator point is not on the curve public static func instance(name: String, p: BInt, a: BInt, b: BInt, gx: BInt, gy: BInt, order: BInt, cofactor: Int, oid: ASN1ObjectIdentifier? = nil) throws -> Domain { if (4 * a * a * a + 27 * b * b) % p == BInt.ZERO { throw ECException.domainParameter } - return Domain(DomainP(name, p, a, b, gx, gy, order, cofactor, oid)) + let domain = Domain(DomainP(name, p, a, b, gx, gy, order, cofactor, oid)) + if !domain.contains(domain.g) { + throw ECException.domainParameter + } + return domain } /// Constructs a characteristic 2 domain @@ -257,12 +261,16 @@ public class Domain: CustomStringConvertible, Equatable { /// - cofactor: The cofactor /// - oid: An optional domain OID /// - Returns: The domain - /// - Throws: A *domainParameter* exception if b = 0 + /// - Throws: A *domainParameter* exception if b = 0 or the generator point is not on the curve public static func instance(name: String, rp: RP, a: BInt, b: BInt, gx: BInt, gy: BInt, order: BInt, cofactor: Int, oid: ASN1ObjectIdentifier? = nil) throws -> Domain { if b.isZero { throw ECException.domainParameter } - return Domain(Domain2(name, rp, a, b, gx, gy, order, cofactor, oid)) + let domain = Domain(Domain2(name, rp, a, b, gx, gy, order, cofactor, oid)) + if !domain.contains(domain.g) { + throw ECException.domainParameter + } + return domain } diff --git a/Sources/SwiftECC/Exception.swift b/Sources/SwiftECC/Exception.swift index 68db1be..1a7821a 100755 --- a/Sources/SwiftECC/Exception.swift +++ b/Sources/SwiftECC/Exception.swift @@ -39,6 +39,8 @@ public enum ECException: Error, CustomStringConvertible { return "Unknown domain OID" case .notOnCurve: return "Point not on curve" + case .keyAgreementParameter: + return "Invalid key agreement parameter" } } @@ -60,6 +62,9 @@ public enum ECException: Error, CustomStringConvertible { /// Point to encode does not lie on the domain curve case encodePoint + /// Invalid key agreement parameter + case keyAgreementParameter + /// Not enough input to decrypt case notEnoughInput diff --git a/Sources/SwiftECC/PrivateKey.swift b/Sources/SwiftECC/PrivateKey.swift index f957134..e04fd00 100755 --- a/Sources/SwiftECC/PrivateKey.swift +++ b/Sources/SwiftECC/PrivateKey.swift @@ -161,4 +161,50 @@ public class ECPrivateKey: CustomStringConvertible { public func decrypt(msg: Data, cipher: AESCipher, mode: BlockMode = .GCM) throws -> Data { return try Data(self.decrypt(msg: Bytes(msg), cipher: cipher, mode: mode)) } + + /// Constructs a shared secret key using Diffie-Hellman key agreement - please refer [SEC 1] section 3.3.1 + /// + /// - Parameters: + /// - pubKey: The other party's public key + /// - length: The required length of the shared secret + /// - md: The message digest algorithm to use + /// - sharedInfo: Information shared with the other party + /// - cofactor: Use cofactor version - *false* is default + /// - Returns: A byte array which is the shared secret key + /// - Throws: An exception if *this* and *pubKey* do not belong to the same domain or *length* is negative + public func keyAgreement(pubKey: ECPublicKey, length: Int, md: MessageDigestAlgorithm, sharedInfo: Bytes, cofactor: Bool = false) throws -> Bytes { + if self.domain != pubKey.domain { + throw ECException.keyAgreementParameter + } + let mda = MessageDigest(md) + if length >= mda.digestLength * 0xffffffff || length < 0 { + throw ECException.keyAgreementParameter + } + var Z = try self.domain.multiplyPoint(pubKey.w, (cofactor ? self.domain.cofactor : 1) * self.s).x.asMagnitudeBytes() + Z = self.domain.align(Z) + + // [SEC 1] - section 3.6.1 + + var k: Bytes = [] + var counter: Bytes = [0, 0, 0, 1] + let n = length == 0 ? 0 : (length - 1) / mda.digestLength + 1 + for _ in 0 ..< n { + mda.update(Z) + mda.update(counter) + mda.update(sharedInfo) + k += mda.digest() + counter[3] &+= 1 + if counter[3] == 0 { + counter[2] &+= 1 + if counter[2] == 0 { + counter[1] &+= 1 + if counter[1] == 0 { + counter[0] &+= 1 + } + } + } + } + return Bytes(k[0 ..< length]) + } + } diff --git a/Sources/SwiftECC/PublicKey.swift b/Sources/SwiftECC/PublicKey.swift index 9ce6911..2bfd757 100755 --- a/Sources/SwiftECC/PublicKey.swift +++ b/Sources/SwiftECC/PublicKey.swift @@ -25,9 +25,9 @@ public class ECPublicKey: CustomStringConvertible { /// - Parameters: /// - domain: The domain the key belongs to /// - w: The public key value - a curve point - /// - Throws: An exception if *w* is not on the curve + /// - Throws: An exception if *w* is not on the curve or is infinity public init(domain: Domain, w: Point) throws { - if !domain.contains(w) { + if !domain.contains(w) || w.infinity { throw ECException.publicKeyParameter } self.domain = domain diff --git a/Tests/SwiftECCTests/Base64Test.swift b/Tests/SwiftECCTests/Base64Test.swift index 90c8b7f..77af31d 100755 --- a/Tests/SwiftECCTests/Base64Test.swift +++ b/Tests/SwiftECCTests/Base64Test.swift @@ -1,6 +1,6 @@ // // Base64Test.swift -// AECTests +// SwiftECCTests // // Created by Leif Ibsen on 06/01/2020. // diff --git a/Tests/SwiftECCTests/CipherTest.swift b/Tests/SwiftECCTests/CipherTest.swift index b2eb765..48ff3f6 100755 --- a/Tests/SwiftECCTests/CipherTest.swift +++ b/Tests/SwiftECCTests/CipherTest.swift @@ -1,6 +1,6 @@ // // CipherTest.swift -// AECTests +// SwiftECCTests // // Created by Leif Ibsen on 04/02/2020. // diff --git a/Tests/SwiftECCTests/CryptoKitTest.swift b/Tests/SwiftECCTests/CryptoKitTest.swift new file mode 100644 index 0000000..18778fe --- /dev/null +++ b/Tests/SwiftECCTests/CryptoKitTest.swift @@ -0,0 +1,193 @@ +// +// CryptoKitTest.swift +// SwiftECCTests +// +// Created by Leif Ibsen on 27/01/2022. +// + +import XCTest +import CryptoKit + +// Test compatibility with Swift CryptoKit +class CryptoKitTest: XCTestCase { + + static let message = "The quick brown fox jumps over the lazy dog!".data(using: .utf8)! + + // CryptoKit signs, SwiftECC verifies + func doTest256A() throws { + let domain = Domain.instance(curve: .EC256r1) + let ckPrivKey = P256.Signing.PrivateKey() + let eccPubKey = try ECPublicKey(pem: ckPrivKey.publicKey.pemRepresentation) + let ckSignature = try ckPrivKey.signature(for: CryptoKitTest.message) + let rs = ckSignature.withUnsafeBytes({return Array($0)}) + let eccSignature = ECSignature(domain: domain, r: Bytes(rs[0 ..< 32]), s: Bytes(rs[32 ..< 64])) + XCTAssertTrue(eccPubKey.verify(signature: eccSignature, msg: CryptoKitTest.message)) + } + + // SwiftECC signs, CryptoKit verifies + func doTest256B() throws { + let domain = Domain.instance(curve: .EC256r1) + let (eccPubKey, eccPrivKey) = domain.makeKeyPair() + let eccSignature = eccPrivKey.sign(msg: CryptoKitTest.message) + let ckSignature = try P256.Signing.ECDSASignature(rawRepresentation: eccSignature.r + eccSignature.s) + let ckPubKey = try P256.Signing.PublicKey(pemRepresentation: eccPubKey.pem) + XCTAssertTrue(ckPubKey.isValidSignature(ckSignature, for: CryptoKitTest.message)) + } + + // CryptoKit signs, SwiftECC verifies + func doTest384A() throws { + let domain = Domain.instance(curve: .EC384r1) + let ckPrivKey = P384.Signing.PrivateKey() + let eccPubKey = try ECPublicKey(pem: ckPrivKey.publicKey.pemRepresentation) + let ckSignature = try ckPrivKey.signature(for: CryptoKitTest.message) + let rs = ckSignature.withUnsafeBytes({return Array($0)}) + let eccSignature = ECSignature(domain: domain, r: Bytes(rs[0 ..< 48]), s: Bytes(rs[48 ..< 96])) + XCTAssertTrue(eccPubKey.verify(signature: eccSignature, msg: CryptoKitTest.message)) + } + + // SwiftECC signs, CryptoKit verifies + func doTest384B() throws { + let domain = Domain.instance(curve: .EC384r1) + let (eccPubKey, eccPrivKey) = domain.makeKeyPair() + let signature = eccPrivKey.sign(msg: CryptoKitTest.message) + let ckSignature = try P384.Signing.ECDSASignature(rawRepresentation: signature.r + signature.s) + let ckPubKey = try P384.Signing.PublicKey(pemRepresentation: eccPubKey.pem) + XCTAssertTrue(ckPubKey.isValidSignature(ckSignature, for: CryptoKitTest.message)) + } + + // CryptoKit signs, SwiftECC verifies + func doTest521A() throws { + let domain = Domain.instance(curve: .EC521r1) + let ckPrivKey = P521.Signing.PrivateKey() + let eccPubKey = try ECPublicKey(pem: ckPrivKey.publicKey.pemRepresentation) + let ckSignature = try ckPrivKey.signature(for: CryptoKitTest.message) + let rs = ckSignature.withUnsafeBytes({return Array($0)}) + let eccSignature = ECSignature(domain: domain, r: Bytes(rs[0 ..< 66]), s: Bytes(rs[66 ..< 132])) + XCTAssertTrue(eccPubKey.verify(signature: eccSignature, msg: CryptoKitTest.message)) + } + + // SwiftECC signs, CryptoKit verifies + func doTest521B() throws { + let domain = Domain.instance(curve: .EC521r1) + let (eccPubKey, eccPrivKey) = domain.makeKeyPair() + let eccSignature = eccPrivKey.sign(msg: CryptoKitTest.message) + let ckSignature = try P521.Signing.ECDSASignature(rawRepresentation: eccSignature.r + eccSignature.s) + let ckPubKey = try P521.Signing.PublicKey(pemRepresentation: eccPubKey.pem) + XCTAssertTrue(ckPubKey.isValidSignature(ckSignature, for: CryptoKitTest.message)) + } + + func doECDH256(_ info: Bytes, _ length: Int) throws { + let domain = Domain.instance(curve: .EC256r1) + let (eccPubKey, eccPrivKey) = domain.makeKeyPair() + let ckPrivKey = P256.KeyAgreement.PrivateKey() + let ckPubKey = ckPrivKey.publicKey + + // CryptoKit public key converted to SwiftECC format + let eccPubKey2 = try ECPublicKey(pem: ckPubKey.pemRepresentation) + + // SwiftECC public key converted to CryptoKit format + let ckPubKey2 = try P256.KeyAgreement.PublicKey(pemRepresentation: eccPubKey.pem) + + // Secret computed with CryptoKit keys + let secret1 = try ckPrivKey.sharedSecretFromKeyAgreement(with: ckPubKey2).x963DerivedSymmetricKey(using: SHA256.self, sharedInfo: info, outputByteCount: length).withUnsafeBytes({return Array($0)}) + + // Secret computed with SwiftECC keys + let secret2 = try eccPrivKey.keyAgreement(pubKey: eccPubKey2, length: length, md: .SHA2_256, sharedInfo: info) + XCTAssertEqual(secret1, secret2) + } + + func doECDH384(_ info: Bytes, _ length: Int) throws { + let domain = Domain.instance(curve: .EC384r1) + let (eccPubKey, eccPrivKey) = domain.makeKeyPair() + let ckPrivKey = P384.KeyAgreement.PrivateKey() + let ckPubKey = ckPrivKey.publicKey + + // CryptoKit public key converted to SwiftECC format + let eccPubKey2 = try ECPublicKey(pem: ckPubKey.pemRepresentation) + + // SwiftECC public key converted to CryptoKit format + let ckPubKey2 = try P384.KeyAgreement.PublicKey(pemRepresentation: eccPubKey.pem) + + // Secret computed with CryptoKit keys + let secret1 = try ckPrivKey.sharedSecretFromKeyAgreement(with: ckPubKey2).x963DerivedSymmetricKey(using: SHA384.self, sharedInfo: info, outputByteCount: length).withUnsafeBytes({return Array($0)}) + + // Secret computed with SwiftECC keys + let secret2 = try eccPrivKey.keyAgreement(pubKey: eccPubKey2, length: length, md: .SHA2_384, sharedInfo: info) + XCTAssertEqual(secret1, secret2) + } + + func doECDH521(_ info: Bytes, _ length: Int) throws { + let domain = Domain.instance(curve: .EC521r1) + let (eccPubKey, eccPrivKey) = domain.makeKeyPair() + let ckPrivKey = P521.KeyAgreement.PrivateKey() + let ckPubKey = ckPrivKey.publicKey + + // CryptoKit public key converted to SwiftECC format + let eccPubKey2 = try ECPublicKey(pem: ckPubKey.pemRepresentation) + + // SwiftECC public key converted to CryptoKit format + let ckPubKey2 = try P521.KeyAgreement.PublicKey(pemRepresentation: eccPubKey.pem) + + // Secret computed with CryptoKit keys + let secret1 = try ckPrivKey.sharedSecretFromKeyAgreement(with: ckPubKey2).x963DerivedSymmetricKey(using: SHA512.self, sharedInfo: info, outputByteCount: length).withUnsafeBytes({return Array($0)}) + + // Secret computed with SwiftECC keys + let secret2 = try eccPrivKey.keyAgreement(pubKey: eccPubKey2, length: length, md: .SHA2_512, sharedInfo: info) + XCTAssertEqual(secret1, secret2) + } + + func doECDH(_ info: Bytes, _ length: Int) throws { + try doECDH256(info, length) + try doECDH384(info, length) + try doECDH521(info, length) + } + + func testECDH() throws { + try doECDH([], 1000) + try doECDH([], 32) + try doECDH([], 1) + try doECDH([], 0) + try doECDH([1, 2, 3], 1000) + try doECDH([1, 2, 3], 32) + try doECDH([1, 2, 3], 1) + try doECDH([1, 2, 3], 0) + try doECDH(Bytes(repeating: 1, count: 1000), 1000) + try doECDH(Bytes(repeating: 1, count: 1000), 32) + try doECDH(Bytes(repeating: 1, count: 1000), 1) + try doECDH(Bytes(repeating: 1, count: 1000), 0) + } + + func testSignature() throws { + for _ in 0 ..< 10 { + try doTest256A() + try doTest256B() + try doTest384A() + try doTest384B() + try doTest521A() + try doTest521B() + } + } + + func testConversion() throws { + let d256 = Domain.instance(curve: .EC256r1) + let (pub256, _) = d256.makeKeyPair() + let ckPubKey256 = try P256.KeyAgreement.PublicKey(pemRepresentation: pub256.pem) + let pub1 = try ECPublicKey(pem: ckPubKey256.pemRepresentation) + XCTAssertEqual(pub256.domain, pub1.domain) + XCTAssertEqual(pub256.w, pub1.w) + + let d384 = Domain.instance(curve: .EC384r1) + let (pub384, _) = d384.makeKeyPair() + let ckPubKey384 = try P384.KeyAgreement.PublicKey(pemRepresentation: pub384.pem) + let pub2 = try ECPublicKey(pem: ckPubKey384.pemRepresentation) + XCTAssertEqual(pub384.domain, pub2.domain) + XCTAssertEqual(pub384.w, pub2.w) + + let d521 = Domain.instance(curve: .EC521r1) + let (pub521, _) = d521.makeKeyPair() + let ckPubKey521 = try P521.KeyAgreement.PublicKey(pemRepresentation: pub521.pem) + let pub3 = try ECPublicKey(pem: ckPubKey521.pemRepresentation) + XCTAssertEqual(pub521.domain, pub3.domain) + XCTAssertEqual(pub521.w, pub3.w) + } +} diff --git a/Tests/SwiftECCTests/ECDHTest.swift b/Tests/SwiftECCTests/ECDHTest.swift new file mode 100644 index 0000000..11518b4 --- /dev/null +++ b/Tests/SwiftECCTests/ECDHTest.swift @@ -0,0 +1,48 @@ +// +// ECDHTest.swift +// SwiftECCTests +// +// Created by Leif Ibsen on 25/01/2022. +// + +import XCTest +import BigInt + +class ECDHTest: XCTestCase { + + func test1() throws { + for c in ECCurve.allCases { + let domain = Domain.instance(curve: c) + let (pubA, privA) = domain.makeKeyPair() + let (pubB, privB) = domain.makeKeyPair() + var secret1 = try privA.keyAgreement(pubKey: pubB, length: 100, md: .SHA2_224, sharedInfo: []) + var secret2 = try privB.keyAgreement(pubKey: pubA, length: 100, md: .SHA2_224, sharedInfo: []) + XCTAssertEqual(secret1, secret2) + secret1 = try privA.keyAgreement(pubKey: pubB, length: 100, md: .SHA2_224, sharedInfo: [], cofactor: true) + secret2 = try privB.keyAgreement(pubKey: pubA, length: 100, md: .SHA2_224, sharedInfo: [], cofactor: true) + XCTAssertEqual(secret1, secret2) + + secret1 = try privA.keyAgreement(pubKey: pubB, length: 100, md: .SHA2_256, sharedInfo: []) + secret2 = try privB.keyAgreement(pubKey: pubA, length: 100, md: .SHA2_256, sharedInfo: []) + XCTAssertEqual(secret1, secret2) + secret1 = try privA.keyAgreement(pubKey: pubB, length: 100, md: .SHA2_256, sharedInfo: [], cofactor: true) + secret2 = try privB.keyAgreement(pubKey: pubA, length: 100, md: .SHA2_256, sharedInfo: [], cofactor: true) + XCTAssertEqual(secret1, secret2) + + secret1 = try privA.keyAgreement(pubKey: pubB, length: 100, md: .SHA2_384, sharedInfo: []) + secret2 = try privB.keyAgreement(pubKey: pubA, length: 100, md: .SHA2_384, sharedInfo: []) + XCTAssertEqual(secret1, secret2) + secret1 = try privA.keyAgreement(pubKey: pubB, length: 100, md: .SHA2_384, sharedInfo: [], cofactor: true) + secret2 = try privB.keyAgreement(pubKey: pubA, length: 100, md: .SHA2_384, sharedInfo: [], cofactor: true) + XCTAssertEqual(secret1, secret2) + + secret1 = try privA.keyAgreement(pubKey: pubB, length: 100, md: .SHA2_512, sharedInfo: []) + secret2 = try privB.keyAgreement(pubKey: pubA, length: 100, md: .SHA2_512, sharedInfo: []) + XCTAssertEqual(secret1, secret2) + secret1 = try privA.keyAgreement(pubKey: pubB, length: 100, md: .SHA2_512, sharedInfo: [], cofactor: true) + secret2 = try privB.keyAgreement(pubKey: pubA, length: 100, md: .SHA2_512, sharedInfo: [], cofactor: true) + XCTAssertEqual(secret1, secret2) + } + } + +} diff --git a/Tests/SwiftECCTests/ExceptionTest.swift b/Tests/SwiftECCTests/ExceptionTest.swift index b0652ba..ca6fa86 100755 --- a/Tests/SwiftECCTests/ExceptionTest.swift +++ b/Tests/SwiftECCTests/ExceptionTest.swift @@ -157,6 +157,14 @@ jaIqUG0ZPxgrLNoic4S+euqwVc3o6QX4JbMVy5hqAPjAPZBqwpo41MuHCeZYxKt3FOZPwQ== } catch { XCTFail("Expected ECException.publicKeyParameter") } + do { + let domain = Domain.instance(curve: .BP160r1) + try ECPublicKey(domain: domain, w: Point.INFINITY) + XCTFail("Expected ECException.publicKeyParameter") + } catch ECException.publicKeyParameter { + } catch { + XCTFail("Expected ECException.publicKeyParameter") + } } func testUnknownOid() { @@ -214,5 +222,36 @@ jaIqUG0ZPxgrLNoic4S+euqwVc3o6QX4JbMVy5hqAPjAPZBqwpo41MuHCeZYxKt3FOZPwQ== XCTFail("Expected ECException.notOnCurve") } } + + func testECDHParameter() { + let domain1 = Domain.instance(curve: .BP256r1) + let domain2 = Domain.instance(curve: .EC256r1) + let (pub1, priv1) = domain1.makeKeyPair() + let (pub2, _) = domain2.makeKeyPair() + do { + // Different domains + let _ = try priv1.keyAgreement(pubKey: pub2, length: 20, md: .SHA2_256, sharedInfo: []) + XCTFail("Expected ECException.keyAgreementParameter") + } catch ECException.keyAgreementParameter { + } catch { + XCTFail("Expected ECException.keyAgreementParameter") + } + do { + // Length is negative + let _ = try priv1.keyAgreement(pubKey: pub1, length: -20, md: .SHA2_256, sharedInfo: []) + XCTFail("Expected ECException.keyAgreementParameter") + } catch ECException.keyAgreementParameter { + } catch { + XCTFail("Expected ECException.keyAgreementParameter") + } + do { + // Length is too large + let _ = try priv1.keyAgreement(pubKey: pub1, length: 32 * 0xffffffff, md: .SHA2_256, sharedInfo: []) + XCTFail("Expected ECException.keyAgreementParameter") + } catch ECException.keyAgreementParameter { + } catch { + XCTFail("Expected ECException.keyAgreementParameter") + } + } } diff --git a/Tests/SwiftECCTests/GCMTest.swift b/Tests/SwiftECCTests/GCMTest.swift index a2d07ec..eaff563 100755 --- a/Tests/SwiftECCTests/GCMTest.swift +++ b/Tests/SwiftECCTests/GCMTest.swift @@ -1,6 +1,6 @@ // // GCMTest.swift -// AECTests +// SwiftECCTests // // Created by Leif Ibsen on 08/02/2020. // diff --git a/Tests/SwiftECCTests/Test29.swift b/Tests/SwiftECCTests/Test29.swift index 080d7af..97af2ce 100755 --- a/Tests/SwiftECCTests/Test29.swift +++ b/Tests/SwiftECCTests/Test29.swift @@ -107,6 +107,14 @@ class Test29: XCTestCase { } catch { XCTFail("Expected domainParameter exception") } + do { + // Generator point not on curve + try Domain.instance(name: EC29.name, p: EC29.fp, a: EC29.a, b: EC29.b, gx: EC29.gx, gy: BInt("1")!, order: EC29.order, cofactor: EC29.cofactor) + XCTFail("Expected domainParameter exception") + } catch ECException.domainParameter { + } catch { + XCTFail("Expected domainParameter exception") + } } func test4() throws { diff --git a/Tests/SwiftECCTests/Test4.swift b/Tests/SwiftECCTests/Test4.swift index f908436..0778dda 100755 --- a/Tests/SwiftECCTests/Test4.swift +++ b/Tests/SwiftECCTests/Test4.swift @@ -94,6 +94,14 @@ class Test4: XCTestCase { } catch { XCTFail("Expected domainParameter exception") } + do { + // Generator point not on curve + try Domain.instance(name: EC4.name, rp: EC4.rp, a: EC4.a, b: EC4.b, gx: EC4.gx, gy: BInt("2")!, order: EC4.order, cofactor: EC4.cofactor) + XCTFail("Expected domainParameter exception") + } catch ECException.domainParameter { + } catch { + XCTFail("Expected domainParameter exception") + } } func test4() throws { diff --git a/docs/Classes.html b/docs/Classes.html index 7af5295..de66bc8 100644 --- a/docs/Classes.html +++ b/docs/Classes.html @@ -18,17 +18,17 @@
Reference
- 
+
Classes Reference