Skip to content

Commit d4e8f6d

Browse files
tobihagemanntobihagemann
committed
Fixed linter warnings
1 parent c9b4e74 commit d4e8f6d

File tree

4 files changed

+26
-30
lines changed

4 files changed

+26
-30
lines changed

‎Sources/CryptomatorCryptoLib/AesSiv.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class AesSiv {
7676

7777
var d = try cmac(macKey: macKey, data: zero)
7878
for s in ad {
79-
d = xor(dbl(d), try cmac(macKey: macKey, data: s))
79+
d = try xor(dbl(d), cmac(macKey: macKey, data: s))
8080
}
8181

8282
let t: [UInt8]

‎Sources/CryptomatorCryptoLib/Cryptor.swift‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,7 @@ public class Cryptor {
155155

156156
// decrypt:
157157
let cleartext = try AesSiv.decrypt(aesKey: masterkey.aesMasterKey, macKey: masterkey.macMasterKey, ciphertext: [UInt8](ciphertextData), ad: [UInt8](dirId))
158-
if let str = String(data: Data(cleartext), encoding: .utf8) {
159-
return str
160-
} else {
161-
throw CryptoError.invalidParameter("Unable to decode cleartext using UTF-8.")
162-
}
158+
return String(decoding: Data(cleartext), as: UTF8.self)
163159
}
164160

165161
// MARK: - File Header Encryption and Decryption

‎Tests/CryptomatorCryptoLibTests/CryptorTests.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ class CryptorTests: XCTestCase {
3232
}
3333

3434
func testEncryptDirId() throws {
35-
let rootDir = try cryptor.encryptDirId("".data(using: .utf8)!)
35+
let rootDir = try cryptor.encryptDirId(Data("".utf8))
3636
XCTAssertEqual("VLWEHT553J5DR7OZLRJAYDIWFCXZABOD", rootDir)
3737

38-
let testDir = try cryptor.encryptDirId("918acfbd-a467-3f77-93f1-f4a44f9cfe9c".data(using: .utf8)!)
38+
let testDir = try cryptor.encryptDirId(Data("918acfbd-a467-3f77-93f1-f4a44f9cfe9c".utf8))
3939
XCTAssertEqual("7C3USOO3VU7IVQRKFMRFV3QE4VEZJECV", testDir)
4040
}
4141

4242
func testEncryptAndDecryptName() throws {
43-
let dirId = "foo".data(using: .utf8)!
43+
let dirId = Data("foo".utf8)
4444
let originalName = "hello.txt"
4545

4646
let ciphertextName = try cryptor.encryptFileName(originalName, dirId: dirId)
@@ -52,7 +52,7 @@ class CryptorTests: XCTestCase {
5252
}
5353

5454
func testDecryptInvalidName() throws {
55-
let dirId = "foo".data(using: .utf8)!
55+
let dirId = Data("foo".utf8)
5656
XCTAssertThrowsError(try cryptor.decryptFileName("****", dirId: dirId), "invalid ciphertext name encoding") { error in
5757
XCTAssertEqual(.invalidParameter("Can't base64url-decode ciphertext name: ****"), error as? CryptoError)
5858
}

‎Tests/CryptomatorCryptoLibTests/MasterkeyFileTests.swift‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import XCTest
1212

1313
class MasterkeyFileTests: XCTestCase {
1414
func testCreateWithContentFromData() throws {
15-
let data = """
15+
let data = Data("""
1616
{
1717
"version": 7,
1818
"scryptSalt": "AAAAAAAAAAA=",
@@ -22,7 +22,7 @@ class MasterkeyFileTests: XCTestCase {
2222
"hmacMasterKey": "mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==",
2323
"versionMac": "cn2sAK6l9p1/w9deJVUuW3h7br056mpv5srvALiYw+g="
2424
}
25-
""".data(using: .utf8)!
25+
""".utf8)
2626
let masterkeyFile = try MasterkeyFile.withContentFromData(data: data)
2727
XCTAssertEqual(7, masterkeyFile.content.version)
2828
XCTAssertEqual("AAAAAAAAAAA=", masterkeyFile.content.scryptSalt)
@@ -35,7 +35,7 @@ class MasterkeyFileTests: XCTestCase {
3535

3636
func testUnlockWithPassphrase() throws {
3737
let expectedKey = [UInt8](repeating: 0x00, count: 32)
38-
let data = """
38+
let data = Data("""
3939
{
4040
"version": 7,
4141
"scryptSalt": "AAAAAAAAAAA=",
@@ -45,15 +45,15 @@ class MasterkeyFileTests: XCTestCase {
4545
"hmacMasterKey": "mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==",
4646
"versionMac": "cn2sAK6l9p1/w9deJVUuW3h7br056mpv5srvALiYw+g="
4747
}
48-
""".data(using: .utf8)!
48+
""".utf8)
4949
let masterkeyFile = try MasterkeyFile.withContentFromData(data: data)
5050
let masterkey = try masterkeyFile.unlock(passphrase: "asd", pepper: [UInt8]())
5151
XCTAssertEqual(expectedKey, masterkey.aesMasterKey)
5252
XCTAssertEqual(expectedKey, masterkey.macMasterKey)
5353
}
5454

5555
func testUnlockWithWrongPassphrase() throws {
56-
let data = """
56+
let data = Data("""
5757
{
5858
"version": 7,
5959
"scryptSalt": "AAAAAAAAAAA=",
@@ -63,15 +63,15 @@ class MasterkeyFileTests: XCTestCase {
6363
"hmacMasterKey": "mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==",
6464
"versionMac": "cn2sAK6l9p1/w9deJVUuW3h7br056mpv5srvALiYw+g="
6565
}
66-
""".data(using: .utf8)!
66+
""".utf8)
6767
let masterkeyFile = try MasterkeyFile.withContentFromData(data: data)
6868
XCTAssertThrowsError(try masterkeyFile.unlock(passphrase: "qwe", pepper: [UInt8]()), "wrong passphrase") { error in
6969
XCTAssertEqual(.invalidPassphrase, error as? MasterkeyFileError)
7070
}
7171
}
7272

7373
func testUnlockWithInvalidVersionMac() throws {
74-
let data = """
74+
let data = Data("""
7575
{
7676
"version": 7,
7777
"scryptSalt": "AAAAAAAAAAA=",
@@ -81,15 +81,15 @@ class MasterkeyFileTests: XCTestCase {
8181
"hmacMasterKey": "mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==",
8282
"versionMac": "cn2sAK6l9p1/w9deJVUuW3h7br056mpv5srvALiYw+G="
8383
}
84-
""".data(using: .utf8)!
84+
""".utf8)
8585
let masterkeyFile = try MasterkeyFile.withContentFromData(data: data)
8686
XCTAssertThrowsError(try masterkeyFile.unlock(passphrase: "asd", pepper: [UInt8]()), "invalid version mac") { error in
8787
XCTAssertEqual(.malformedMasterkeyFile("incorrect version or versionMac"), error as? MasterkeyFileError)
8888
}
8989
}
9090

9191
func testUnlockWithMalformedJson1() throws {
92-
let data = """
92+
let data = Data("""
9393
{
9494
"version": 7,
9595
"scryptSalt": "AAAAAAAAAAA=",
@@ -99,15 +99,15 @@ class MasterkeyFileTests: XCTestCase {
9999
"hmacMasterKey": "mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==",
100100
"versionMac": "cn2sAK6l9p1/w9deJVUuW3h7br056mpv5srvALiYw+g="
101101
}
102-
""".data(using: .utf8)!
102+
""".utf8)
103103
let masterkeyFile = try MasterkeyFile.withContentFromData(data: data)
104104
XCTAssertThrowsError(try masterkeyFile.unlock(passphrase: "asd", pepper: [UInt8]()), "malformed json") { error in
105105
XCTAssertEqual(.malformedMasterkeyFile("invalid base64 data in primaryMasterKey"), error as? MasterkeyFileError)
106106
}
107107
}
108108

109109
func testUnlockWithMalformedJson2() throws {
110-
let data = """
110+
let data = Data("""
111111
{
112112
"version": 7,
113113
"scryptSalt": "AAAAAAAAAAA=",
@@ -117,15 +117,15 @@ class MasterkeyFileTests: XCTestCase {
117117
"hmacMasterKey": "mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q!!",
118118
"versionMac": "cn2sAK6l9p1/w9deJVUuW3h7br056mpv5srvALiYw+g="
119119
}
120-
""".data(using: .utf8)!
120+
""".utf8)
121121
let masterkeyFile = try MasterkeyFile.withContentFromData(data: data)
122122
XCTAssertThrowsError(try masterkeyFile.unlock(passphrase: "asd", pepper: [UInt8]()), "malformed json") { error in
123123
XCTAssertEqual(.malformedMasterkeyFile("invalid base64 data in hmacMasterKey"), error as? MasterkeyFileError)
124124
}
125125
}
126126

127127
func testUnlockWithMalformedJson3() throws {
128-
let data = """
128+
let data = Data("""
129129
{
130130
"version": 7,
131131
"scryptSalt": "AAAAAAAAAAA=",
@@ -135,7 +135,7 @@ class MasterkeyFileTests: XCTestCase {
135135
"hmacMasterKey": "mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==",
136136
"versionMac": "cn2sAK6l"
137137
}
138-
""".data(using: .utf8)!
138+
""".utf8)
139139
let masterkeyFile = try MasterkeyFile.withContentFromData(data: data)
140140
XCTAssertThrowsError(try masterkeyFile.unlock(passphrase: "asd", pepper: [UInt8]()), "malformed json") { error in
141141
XCTAssertEqual(.malformedMasterkeyFile("invalid base64 data in versionMac"), error as? MasterkeyFileError)
@@ -149,7 +149,7 @@ class MasterkeyFileTests: XCTestCase {
149149
0x62, 0x11, 0xD9, 0xAF, 0xE2, 0xF5, 0x5F, 0xDE,
150150
0xDF, 0xCB, 0xB5, 0xE7, 0x5A, 0xEF, 0x34, 0xF9
151151
]
152-
let data = """
152+
let data = Data("""
153153
{
154154
"version": 7,
155155
"scryptSalt": "AAAAAAAAAAA=",
@@ -159,15 +159,15 @@ class MasterkeyFileTests: XCTestCase {
159159
"hmacMasterKey": "mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==",
160160
"versionMac": "cn2sAK6l9p1/w9deJVUuW3h7br056mpv5srvALiYw+g="
161161
}
162-
""".data(using: .utf8)!
162+
""".utf8)
163163
let masterkeyFile = try MasterkeyFile.withContentFromData(data: data)
164164
let kek = try masterkeyFile.deriveKey(passphrase: "asd", pepper: [UInt8]())
165165
XCTAssertEqual(expectedKey, kek)
166166
}
167167

168168
func testUnlockWithKEK() throws {
169169
let expectedKey = [UInt8](repeating: 0x00, count: 32)
170-
let data = """
170+
let data = Data("""
171171
{
172172
"version": 7,
173173
"scryptSalt": "AAAAAAAAAAA=",
@@ -177,7 +177,7 @@ class MasterkeyFileTests: XCTestCase {
177177
"hmacMasterKey": "mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==",
178178
"versionMac": "cn2sAK6l9p1/w9deJVUuW3h7br056mpv5srvALiYw+g="
179179
}
180-
""".data(using: .utf8)!
180+
""".utf8)
181181
let masterkeyFile = try MasterkeyFile.withContentFromData(data: data)
182182
let kek: [UInt8] = [
183183
0x8C, 0xF4, 0xA0, 0x4E, 0xC8, 0x45, 0xF4, 0x28,
@@ -211,7 +211,7 @@ class MasterkeyFileTests: XCTestCase {
211211

212212
func testChangePassphrase() throws {
213213
let expectedKey = [UInt8](repeating: 0x00, count: 32)
214-
let data = """
214+
let data = Data("""
215215
{
216216
"version": 7,
217217
"scryptSalt": "AAAAAAAAAAA=",
@@ -221,7 +221,7 @@ class MasterkeyFileTests: XCTestCase {
221221
"hmacMasterKey": "mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==",
222222
"versionMac": "cn2sAK6l9p1/w9deJVUuW3h7br056mpv5srvALiYw+g="
223223
}
224-
""".data(using: .utf8)!
224+
""".utf8)
225225
let content = try MasterkeyFile.changePassphrase(masterkeyFileData: data, oldPassphrase: "asd", newPassphrase: "qwe", pepper: [UInt8](), scryptCostParam: 2, cryptoSupport: CryptoSupportMock())
226226
let masterkeyFile = MasterkeyFile(content: content)
227227
let masterkey = try masterkeyFile.unlock(passphrase: "qwe", pepper: [UInt8]())

0 commit comments

Comments
 (0)