status-im
/
Keycard.swift
mirror of https://github.com/status-im/Keycard.swift.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup

This commit is contained in:
Dmitry Bespalov 2019-09-30 16:25:30 +02:00
parent 8c6bd97e78
commit 343448e0dc
8 changed files with 14 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Package.resolved
View File

@ -12,10 +12,10 @@
},
{
"package": "secp256k1",
"repositoryURL": "https://github.com/gnosis/secp256k1.swift.git",
"repositoryURL": "https://github.com/status-im/secp256k1.swift.git",
"state": {
"branch": "master",
"revision": "43bb7f4e4cfa6317272c50b9dae4e88e53e258c0",
"revision": "d2c49786e9245d77f4eba6ce78a87f87506623c5",
"version": null
}
}

2
Package.swift
View File

@ -15,7 +15,7 @@ let package = Package(
targets: ["Keycard"]),
],
dependencies: [
.package(url: "https://github.com/gnosis/secp256k1.swift.git", .branch("master")),
.package(url: "https://github.com/status-im/secp256k1.swift.git", .branch("master")),
.package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", .upToNextMinor(from: "1.0.0"))
],

8
README.md
View File

@ -5,11 +5,3 @@ This is a Swift SDK to integrate [Keycard](https://github.com/status-im/status-k
This SDK is a work in progress, please check the Issues to contribute.
To integrate Keycard with Android or Desktop, please refer to [Keycard Java SDK](https://github.com/status-im/status-keycard-java). Keycard also has a [Go SDK](https://github.com/status-im/keycard-go/).
Xcode generated project
libsecp256k1 header search paths missing "$(SRCROOT)/../secp2561k/Classes" prefixes
https://forums.swift.org/t/headersearchpath-issue/26468/6

19
Sources/Keycard/Crypto.swift
View File

@ -59,23 +59,8 @@ class Crypto {
}
}
func pbkdf2(password: String, salt: [UInt8], iterations: Int, hmac: PBKDF2HMac) -> [UInt8] {
let keyLength: Int
let variant: HMAC.Variant
switch hmac {
case .sha256:
keyLength = 32
variant = .sha256
case .sha512:
keyLength = 64
variant = .sha512
}
return try! PKCS5.PBKDF2(password: Array(password.utf8), salt: salt, iterations: iterations, keyLength: keyLength, variant: variant).calculate()
}
func new_pbkdf2(password: String, salt: [UInt8], iterations requiredIterations: Int? = nil, hmac: PBKDF2HMac) -> [UInt8] {
func pbkdf2(password: String, salt: [UInt8], iterations requiredIterations: Int? = nil, hmac: PBKDF2HMac) -> [UInt8] {
// implemented using CommonCrypto because it is much faster (ms vs s) on the device than CryptoSwfit implementation.
let keyLength: Int
let prf: CCPseudoRandomAlgorithm

5
Sources/Keycard/KeycardCommandSet.swift
View File

@ -14,7 +14,10 @@ public class KeycardCommandSet {
}
func pairingPasswordToSecret(password: String) -> [UInt8] {
Crypto.shared.new_pbkdf2(password: password, salt: Array("Keycard Pairing Password Salt".utf8), iterations: cardChannel.pairingPasswordPBKDF2IterationCount, hmac: PBKDF2HMac.sha256)
Crypto.shared.pbkdf2(password: password,
salt: Array("Keycard Pairing Password Salt".utf8),
iterations: cardChannel.pairingPasswordPBKDF2IterationCount,
hmac: PBKDF2HMac.sha256)
}
public func select(instanceIdx: UInt8 = 1) throws -> APDUResponse {

2
Sources/Keycard/Logger.swift
View File

@ -5,7 +5,7 @@ open class Logger {
static var shared: Logger = Logger()
public var isEnabled = true
public var isEnabled = false
public init() {}

5
Sources/Keycard/Mnemonic.swift
View File

@ -4,7 +4,10 @@ class Mnemonic {
static let bip39IterationCount = 2048
static func toBinarySeed(mnemonicPhrase: String, password: String = "") -> [UInt8] {
Crypto.shared.new_pbkdf2(password: mnemonicPhrase, salt: Array(("mnemonic" + password).utf8), iterations: Mnemonic.bip39IterationCount, hmac: PBKDF2HMac.sha512)
Crypto.shared.pbkdf2(password: mnemonicPhrase,
salt: Array(("mnemonic" + password).utf8),
iterations: Mnemonic.bip39IterationCount,
hmac: PBKDF2HMac.sha512)
}
let indexes: [UInt16]

24
Tests/KeycardTests/CryptoTests.swift
View File

@ -17,28 +17,4 @@ final class CryptoTests: XCTestCase {
XCTAssertEqual(decryptedText, plaintext)
}
func test_pbkdf() {
let password = "123456"
let salt = [UInt8]("Keycard Pairing Password Salt".utf8)
let hmac = PBKDF2HMac.sha256
let iterations = 100
let old = Crypto.shared.new_pbkdf2(password: password, salt: salt, iterations: iterations, hmac: hmac)
let new = Crypto.shared.pbkdf2(password: password, salt: salt, iterations: iterations, hmac: hmac)
XCTAssertEqual(new, old)
}
func test_cmac() {
continueAfterFailure = false
let plaintext = "Hello, World!"
let plaintextBytes = [UInt8](plaintext.utf8)
let (sk, pk) = Crypto.shared.secp256k1GeneratePair()
let secret = Crypto.shared.secp256k1ECDH(privKey: sk, pubKey: pk)
let fullKey = Crypto.shared.sha512(secret)
XCTAssertEqual(fullKey.count, 64)
let macKey = Array(fullKey[48...])
XCTAssertEqual(macKey.count, 16)
let data = Crypto.shared.aes256CMac(data: plaintextBytes, key: macKey)
XCTAssertFalse(data.isEmpty)
}
}