Merge branch 'release/1.0.2'

Author: tobihagemann

.swiftformat

@@ -1,4 +1,4 @@
---minversion 0.49.0
+--minversion 0.49.2
 
 # format options
 
@@ -15,4 +15,4 @@
 # rules
 
 --enable isEmpty
---disable redundantReturn,trailingClosures
+--disable redundantReturn,trailingClosures,wrapMultilineStatementBraces

README.md

@@ -7,7 +7,7 @@
 
 This library contains all cryptographic functions that are used by Cryptomator for iOS. The purpose of this project is to provide a separate light-weight library with its own release cycle that can be used in other projects, too.
 
-For more information on the Cryptomator encryption scheme, visit the security architecture page on [docs.cryptomator.org](https://docs.cryptomator.org/en/1.5/security/architecture/).
+For more information on the Cryptomator encryption scheme, visit the security architecture page on [docs.cryptomator.org](https://docs.cryptomator.org/en/1.6/security/architecture/).
 
 ## Requirements
 

Sources/CryptomatorCryptoLib/AesSiv.swift

@@ -19,12 +19,14 @@ class AesSiv {
 
 	 - Parameter aesKey: SIV mode requires two separate keys. You can use one long key, which is splitted in half. See [RFC 5297 Section 2.2](https://tools.ietf.org/html/rfc5297#section-2.2).
 	 - Parameter macKey: SIV mode requires two separate keys. You can use one long key, which is splitted in half. See [RFC 5297 Section 2.2](https://tools.ietf.org/html/rfc5297#section-2.2).
-	 - Parameter plaintext: Your plaintext, which shall be encrypted.
+	 - Parameter plaintext: Your plaintext, which shall be encrypted. It must not be longer than 2^32 - 16 bytes.
 	 - Parameter ad: Associated data, which gets authenticated but not encrypted.
 	 - Returns: IV + Ciphertext as a concatenated byte array.
 	 */
 	static func encrypt(aesKey: [UInt8], macKey: [UInt8], plaintext: [UInt8], ad: [UInt8]...) throws -> [UInt8] {
-		assert(plaintext.count <= UInt32.max - 16, "plaintext must not be longer than 2^32 - 16 bytes")
+		guard plaintext.count <= UInt32.max - 16 else {
+			throw CryptoError.invalidParameter("plaintext must not be longer than 2^32 - 16 bytes")
+		}
 		let iv = try s2v(macKey: macKey, plaintext: plaintext, ad: ad)
 		let ciphertext = try ctr(aesKey: aesKey, iv: iv, plaintext: plaintext)
 		return iv + ciphertext
@@ -35,12 +37,14 @@ class AesSiv {
 
 	 - Parameter aesKey: SIV mode requires two separate keys. You can use one long key, which is splitted in half. See [RFC 5297 Section 2.2](https://tools.ietf.org/html/rfc5297#section-2.2).
 	 - Parameter macKey: SIV mode requires two separate keys. You can use one long key, which is splitted in half. See [RFC 5297 Section 2.2](https://tools.ietf.org/html/rfc5297#section-2.2).
-	 - Parameter ciphertext: Your ciphertext, which shall be decrypted.
+	 - Parameter ciphertext: Your ciphertext, which shall be decrypted. It must be at least 16 bytes.
 	 - Parameter ad: Associated data, which needs to be authenticated during decryption.
 	 - Returns: Plaintext byte array.
 	 */
 	static func decrypt(aesKey: [UInt8], macKey: [UInt8], ciphertext: [UInt8], ad: [UInt8]...) throws -> [UInt8] {
-		assert(ciphertext.count >= 16, "ciphertext must be at least 16 bytes")
+		guard ciphertext.count >= 16 else {
+			throw CryptoError.invalidParameter("ciphertext must be at least 16 bytes")
+		}
 		let iv = Array(ciphertext[..<16])
 		let actualCiphertext = Array(ciphertext[16...])
 		let plaintext = try ctr(aesKey: aesKey, iv: iv, plaintext: actualCiphertext)

Tests/CryptomatorCryptoLibTests/CryptorTests.swift

@@ -49,6 +49,16 @@ class CryptorTests: XCTestCase {
 		XCTAssertEqual(originalName, cleartextName)
 	}
 
+	func testDecryptInvalidName() throws {
+		let dirId = "foo".data(using: .utf8)!
+		XCTAssertThrowsError(try cryptor.decryptFileName("****", dirId: dirId), "invalid ciphertext name encoding") { error in
+			XCTAssertEqual(.invalidParameter("Can't base64url-decode ciphertext name: ****"), error as? CryptoError)
+		}
+		XCTAssertThrowsError(try cryptor.decryptFileName("test", dirId: dirId), "invalid ciphertext name count") { error in
+			XCTAssertEqual(.invalidParameter("ciphertext must be at least 16 bytes"), error as? CryptoError)
+		}
+	}
+
 	func testCreateHeader() throws {
 		let header = try cryptor.createHeader()
 		XCTAssertEqual([UInt8](repeating: 0xF0, count: 16), header.nonce)