Skip to content

Commit 986fd4a

Browse files
committed
Merge branch 'release/1.0.0' into develop
2 parents 91bfb3f + 24f6567 commit 986fd4a

File tree

4 files changed

+3
-86
lines changed

4 files changed

+3
-86
lines changed

.swiftformat

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
--minversion 0.47.13
2-
3-
# file options
4-
5-
--exclude Tests/LinuxMain.swift,Tests/**/XCTestManifests.swift
1+
--minversion 0.49.0
62

73
# format options
84

5+
--closurevoid preserve
96
--commas inline
107
--ifdef no-indent
118
--importgrouping testable-bottom

Sources/CryptomatorCryptoLib/AesCtr.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class AesCtr {
3434
let outlen = CCCryptorGetOutputLength(cryptor, data.count, true)
3535
var ciphertext = [UInt8](repeating: 0x00, count: outlen)
3636

37-
var numEncryptedBytes: Int = 0
37+
var numEncryptedBytes = 0
3838
status = CCCryptorUpdate(cryptor, data, data.count, &ciphertext, ciphertext.count, &numEncryptedBytes)
3939
guard status == kCCSuccess else {
4040
throw CryptoError.ccCryptorError(status)

Tests/CryptomatorCryptoLibTests/XCTestManifests.swift

Lines changed: 0 additions & 72 deletions
This file was deleted.

Tests/LinuxMain.swift

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)