|
|
@@ -139,82 +139,94 @@ extension RSA {
|
|
|
case digest_pkcs1v15_SHA512_224
|
|
|
/// This variant expects that the data to be signed is a valid SHA512-256 Hash Digest
|
|
|
case digest_pkcs1v15_SHA512_256
|
|
|
-
|
|
|
+ /// This variant expects that the data to be signed is a valid SHA3-256 Hash Digest
|
|
|
+ case digest_pkcs1v15_SHA3_256
|
|
|
+ /// This variant expects that the data to be signed is a valid SHA3-384 Hash Digest
|
|
|
+ case digest_pkcs1v15_SHA3_384
|
|
|
+ /// This variant expects that the data to be signed is a valid SHA3-512 Hash Digest
|
|
|
+ case digest_pkcs1v15_SHA3_512
|
|
|
+
|
|
|
internal var identifier: Array<UInt8> {
|
|
|
switch self {
|
|
|
- case .raw, .digest_pkcs1v15_RAW: return []
|
|
|
- case .message_pkcs1v15_MD5, .digest_pkcs1v15_MD5: return Array<UInt8>(arrayLiteral: 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x05)
|
|
|
- case .message_pkcs1v15_SHA1, .digest_pkcs1v15_SHA1: return Array<UInt8>(arrayLiteral: 0x2b, 0x0e, 0x03, 0x02, 0x1a)
|
|
|
- case .message_pkcs1v15_SHA256, .digest_pkcs1v15_SHA256: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01)
|
|
|
- case .message_pkcs1v15_SHA384, .digest_pkcs1v15_SHA384: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02)
|
|
|
- case .message_pkcs1v15_SHA512, .digest_pkcs1v15_SHA512: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03)
|
|
|
- case .message_pkcs1v15_SHA224, .digest_pkcs1v15_SHA224: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04)
|
|
|
- case .message_pkcs1v15_SHA512_224, .digest_pkcs1v15_SHA512_224: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x05)
|
|
|
- case .message_pkcs1v15_SHA512_256, .digest_pkcs1v15_SHA512_256: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x06)
|
|
|
+ case .raw, .digest_pkcs1v15_RAW: return []
|
|
|
+ case .message_pkcs1v15_MD5, .digest_pkcs1v15_MD5: return Array<UInt8>(arrayLiteral: 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x05)
|
|
|
+ case .message_pkcs1v15_SHA1, .digest_pkcs1v15_SHA1: return Array<UInt8>(arrayLiteral: 0x2b, 0x0e, 0x03, 0x02, 0x1a)
|
|
|
+ case .message_pkcs1v15_SHA256, .digest_pkcs1v15_SHA256: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01)
|
|
|
+ case .message_pkcs1v15_SHA384, .digest_pkcs1v15_SHA384: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02)
|
|
|
+ case .message_pkcs1v15_SHA512, .digest_pkcs1v15_SHA512: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03)
|
|
|
+ case .message_pkcs1v15_SHA224, .digest_pkcs1v15_SHA224: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04)
|
|
|
+ case .message_pkcs1v15_SHA512_224, .digest_pkcs1v15_SHA512_224: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x05)
|
|
|
+ case .message_pkcs1v15_SHA512_256, .digest_pkcs1v15_SHA512_256: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x06)
|
|
|
+ case .digest_pkcs1v15_SHA3_256: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x08)
|
|
|
+ case .digest_pkcs1v15_SHA3_384: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x09)
|
|
|
+ case .digest_pkcs1v15_SHA3_512: return Array<UInt8>(arrayLiteral: 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x0A)
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
internal func calculateHash(_ bytes: Array<UInt8>) -> Array<UInt8> {
|
|
|
switch self {
|
|
|
- case .message_pkcs1v15_MD5:
|
|
|
- return Digest.md5(bytes)
|
|
|
- case .message_pkcs1v15_SHA1:
|
|
|
- return Digest.sha1(bytes)
|
|
|
- case .message_pkcs1v15_SHA224:
|
|
|
- return Digest.sha224(bytes)
|
|
|
- case .message_pkcs1v15_SHA256:
|
|
|
- return Digest.sha256(bytes)
|
|
|
- case .message_pkcs1v15_SHA384:
|
|
|
- return Digest.sha384(bytes)
|
|
|
- case .message_pkcs1v15_SHA512:
|
|
|
- return Digest.sha512(bytes)
|
|
|
- case .message_pkcs1v15_SHA512_224:
|
|
|
- return Digest.sha2(bytes, variant: .sha224)
|
|
|
- case .message_pkcs1v15_SHA512_256:
|
|
|
- return Digest.sha2(bytes, variant: .sha256)
|
|
|
- case .raw,
|
|
|
- .digest_pkcs1v15_RAW,
|
|
|
- .digest_pkcs1v15_MD5,
|
|
|
- .digest_pkcs1v15_SHA1,
|
|
|
- .digest_pkcs1v15_SHA224,
|
|
|
- .digest_pkcs1v15_SHA256,
|
|
|
- .digest_pkcs1v15_SHA384,
|
|
|
- .digest_pkcs1v15_SHA512,
|
|
|
- .digest_pkcs1v15_SHA512_224,
|
|
|
- .digest_pkcs1v15_SHA512_256:
|
|
|
- return bytes
|
|
|
+ case .message_pkcs1v15_MD5:
|
|
|
+ return Digest.md5(bytes)
|
|
|
+ case .message_pkcs1v15_SHA1:
|
|
|
+ return Digest.sha1(bytes)
|
|
|
+ case .message_pkcs1v15_SHA224:
|
|
|
+ return Digest.sha224(bytes)
|
|
|
+ case .message_pkcs1v15_SHA256:
|
|
|
+ return Digest.sha256(bytes)
|
|
|
+ case .message_pkcs1v15_SHA384:
|
|
|
+ return Digest.sha384(bytes)
|
|
|
+ case .message_pkcs1v15_SHA512:
|
|
|
+ return Digest.sha512(bytes)
|
|
|
+ case .message_pkcs1v15_SHA512_224:
|
|
|
+ return Digest.sha2(bytes, variant: .sha224)
|
|
|
+ case .message_pkcs1v15_SHA512_256:
|
|
|
+ return Digest.sha2(bytes, variant: .sha256)
|
|
|
+ case .raw,
|
|
|
+ .digest_pkcs1v15_RAW,
|
|
|
+ .digest_pkcs1v15_MD5,
|
|
|
+ .digest_pkcs1v15_SHA1,
|
|
|
+ .digest_pkcs1v15_SHA224,
|
|
|
+ .digest_pkcs1v15_SHA256,
|
|
|
+ .digest_pkcs1v15_SHA384,
|
|
|
+ .digest_pkcs1v15_SHA512,
|
|
|
+ .digest_pkcs1v15_SHA512_224,
|
|
|
+ .digest_pkcs1v15_SHA512_256,
|
|
|
+ .digest_pkcs1v15_SHA3_256,
|
|
|
+ .digest_pkcs1v15_SHA3_384,
|
|
|
+ .digest_pkcs1v15_SHA3_512:
|
|
|
+ return bytes
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
internal func enforceLength(_ bytes: Array<UInt8>, keySizeInBytes: Int) -> Bool {
|
|
|
switch self {
|
|
|
- case .raw, .digest_pkcs1v15_RAW:
|
|
|
- return bytes.count <= keySizeInBytes
|
|
|
- case .digest_pkcs1v15_MD5:
|
|
|
- return bytes.count <= 16
|
|
|
- case .digest_pkcs1v15_SHA1:
|
|
|
- return bytes.count <= 20
|
|
|
- case .digest_pkcs1v15_SHA224:
|
|
|
- return bytes.count <= 28
|
|
|
- case .digest_pkcs1v15_SHA256:
|
|
|
- return bytes.count <= 32
|
|
|
- case .digest_pkcs1v15_SHA384:
|
|
|
- return bytes.count <= 48
|
|
|
- case .digest_pkcs1v15_SHA512:
|
|
|
- return bytes.count <= 64
|
|
|
- case .digest_pkcs1v15_SHA512_224:
|
|
|
- return bytes.count <= 28
|
|
|
- case .digest_pkcs1v15_SHA512_256:
|
|
|
- return bytes.count <= 32
|
|
|
- case .message_pkcs1v15_MD5,
|
|
|
- .message_pkcs1v15_SHA1,
|
|
|
- .message_pkcs1v15_SHA224,
|
|
|
- .message_pkcs1v15_SHA256,
|
|
|
- .message_pkcs1v15_SHA384,
|
|
|
- .message_pkcs1v15_SHA512,
|
|
|
- .message_pkcs1v15_SHA512_224,
|
|
|
- .message_pkcs1v15_SHA512_256:
|
|
|
- return true
|
|
|
+ case .raw, .digest_pkcs1v15_RAW:
|
|
|
+ return bytes.count <= keySizeInBytes
|
|
|
+ case .digest_pkcs1v15_MD5:
|
|
|
+ return bytes.count <= 16
|
|
|
+ case .digest_pkcs1v15_SHA1:
|
|
|
+ return bytes.count <= 20
|
|
|
+ case .digest_pkcs1v15_SHA224:
|
|
|
+ return bytes.count <= 28
|
|
|
+ case .digest_pkcs1v15_SHA256, .digest_pkcs1v15_SHA3_256:
|
|
|
+ return bytes.count <= 32
|
|
|
+ case .digest_pkcs1v15_SHA384, .digest_pkcs1v15_SHA3_384:
|
|
|
+ return bytes.count <= 48
|
|
|
+ case .digest_pkcs1v15_SHA512, .digest_pkcs1v15_SHA3_512:
|
|
|
+ return bytes.count <= 64
|
|
|
+ case .digest_pkcs1v15_SHA512_224:
|
|
|
+ return bytes.count <= 28
|
|
|
+ case .digest_pkcs1v15_SHA512_256:
|
|
|
+ return bytes.count <= 32
|
|
|
+ case .message_pkcs1v15_MD5,
|
|
|
+ .message_pkcs1v15_SHA1,
|
|
|
+ .message_pkcs1v15_SHA224,
|
|
|
+ .message_pkcs1v15_SHA256,
|
|
|
+ .message_pkcs1v15_SHA384,
|
|
|
+ .message_pkcs1v15_SHA512,
|
|
|
+ .message_pkcs1v15_SHA512_224,
|
|
|
+ .message_pkcs1v15_SHA512_256:
|
|
|
+ return true
|
|
|
}
|
|
|
}
|
|
|
|