Swift: Make use of CBC blockmode in examples and tests mode accurate.

Author: geoffw0

swift/ql/src/queries/Security/CWE-321/HardcodedEncryptionKey.swift

@@ -6,9 +6,9 @@ func encrypt(padding : Padding) {
 	let key: Array<UInt8> = [0x2a, 0x3a, 0x80, 0x05]
 	let keyString = "this is a constant string"
 	let ivString = getRandomIV()
-	_ = try AES(key: key, blockMode: CBC(), padding: padding)
+	_ = try AES(key: key, blockMode: CBC(AES.randomIV(AES.blockSize)), padding: padding)
 	_ = try AES(key: keyString, iv: ivString)
-	_ = try Blowfish(key: key, blockMode: CBC(), padding: padding)
+	_ = try Blowfish(key: key, blockMode: CBC(Blowfish.randomIV(Blowfish.blockSize)), padding: padding)
 	_ = try Blowfish(key: keyString, iv: ivString)
 
 
@@ -18,9 +18,9 @@ func encrypt(padding : Padding) {
 	if status == errSecSuccess {
 		let keyString = String(cString: key)
 		let ivString = getRandomIV()
-		_ = try AES(key: key, blockMode: CBC(), padding: padding)
+		_ = try AES(key: key, blockMode: CBC(AES.randomIV(AES.blockSize)), padding: padding)
 		_ = try AES(key: keyString, iv: ivString)
-		_ = try Blowfish(key: key, blockMode: CBC(), padding: padding)
+		_ = try Blowfish(key: key, blockMode: CBC(Blowfish.randomIV(Blowfish.blockSize)), padding: padding)
 		_ = try Blowfish(key: keyString, iv: ivString)
 	}
 

swift/ql/src/queries/Security/CWE-327/ECBEncryption.swift

@@ -9,10 +9,11 @@ func encrypt(key : Key, padding : Padding) {
 	_ = try Blowfish(key: key, blockMode: blockMode, padding: padding)
 
 	// GOOD: ECB is not used for block mode
-	let blockMode = CBC()
-	_ = try AES(key: key, blockMode: blockMode, padding: padding)
-	_ = try AES(key: key, blockMode: blockMode)
-	_ = try Blowfish(key: key, blockMode: blockMode, padding: padding)
+	let aesBlockMode = CBC(iv: AES.randomIV(AES.blockSize))
+	let blowfishBlockMode = CBC(iv: Blowfish.randomIV(Blowfish.blockSize))
+	_ = try AES(key: key, blockMode: aesBlockMode, padding: padding)
+	_ = try AES(key: key, blockMode: aesBlockMode)
+	_ = try Blowfish(key: key, blockMode: blowfishBlockMode, padding: padding)
 
 	// ...
 }