read nonce length from ContentCryptor

overheadhunter · overheadhunter · commit 406ac2046027 · 2022-05-20T11:29:55.000+02:00
diff --git a/Sources/CryptomatorCryptoLib/Cryptor.swift b/Sources/CryptomatorCryptoLib/Cryptor.swift
@@ -154,7 +154,7 @@ public class Cryptor {
 	// MARK: - File Header Encryption and Decryption
 
 	func createHeader() throws -> FileHeader {
-		let nonce = try cryptoSupport.createRandomBytes(size: kCCBlockSizeAES128)
+		let nonce = try cryptoSupport.createRandomBytes(size: contentCryptor.nonceLen)
 		let contentKey = try cryptoSupport.createRandomBytes(size: kCCKeySizeAES256)
 		return FileHeader(nonce: nonce, contentKey: contentKey)
 	}
@@ -301,7 +301,7 @@ public class Cryptor {
 	}
 
 	func encryptSingleChunk(_ chunk: [UInt8], chunkNumber: UInt64, headerNonce: [UInt8], fileKey: [UInt8]) throws -> [UInt8] {
-		let chunkNonce = try cryptoSupport.createRandomBytes(size: kCCBlockSizeAES128)
+		let chunkNonce = try cryptoSupport.createRandomBytes(size: contentCryptor.nonceLen)
 		return try contentCryptor.encrypt(chunk, key: fileKey, nonce: chunkNonce, ad: headerNonce, chunkNumber.bigEndian.byteArray())
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public class Cryptor {`
`154`	`154`	`// MARK: - File Header Encryption and Decryption`
`155`	`155`
`156`	`156`	`func createHeader() throws -> FileHeader {`
`157`		`- let nonce = try cryptoSupport.createRandomBytes(size: kCCBlockSizeAES128)`
	`157`	`+ let nonce = try cryptoSupport.createRandomBytes(size: contentCryptor.nonceLen)`
`158`	`158`	`let contentKey = try cryptoSupport.createRandomBytes(size: kCCKeySizeAES256)`
`159`	`159`	`return FileHeader(nonce: nonce, contentKey: contentKey)`
`160`	`160`	`}`
`@@ -301,7 +301,7 @@ public class Cryptor {`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`func encryptSingleChunk(_ chunk: [UInt8], chunkNumber: UInt64, headerNonce: [UInt8], fileKey: [UInt8]) throws -> [UInt8] {`
`304`		`- let chunkNonce = try cryptoSupport.createRandomBytes(size: kCCBlockSizeAES128)`
	`304`	`+ let chunkNonce = try cryptoSupport.createRandomBytes(size: contentCryptor.nonceLen)`
`305`	`305`	`return try contentCryptor.encrypt(chunk, key: fileKey, nonce: chunkNonce, ad: headerNonce, chunkNumber.bigEndian.byteArray())`
`306`	`306`	`}`
`307`	`307`