signalapp/SignalMetadataKit
signalapp/SignalMetadataKit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: signalapp:master
Branches Tags
signalapp:master
signalapp:feature/SignalClient-adoption
signalapp:charlesmchen/buildBreak
signalapp:charlesmchen/owslog
signalapp:mkirk/fixup-tests
signalapp:mkirk/return-sender-id
signalapp:mkirk/fix-tests-exceptions
signalapp:mkirk/wrap-exceptions
...
pull from: signalapp:charlesmchen/owslog
Branches Tags
signalapp:master
signalapp:feature/SignalClient-adoption
signalapp:charlesmchen/buildBreak
signalapp:charlesmchen/owslog
signalapp:mkirk/fixup-tests
signalapp:mkirk/return-sender-id
signalapp:mkirk/fix-tests-exceptions
signalapp:mkirk/wrap-exceptions

1 Commits
master ... charlesmch

Author SHA1 Message Date
Matthew Chen
81f7f4d6e6 Rename Logger to OWSLog. 2021-03-05 11:59:01 -03:00
2 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

10
SignalMetadataKit/src/SMKCertificateValidator.swift
View File

@ -53,9 +53,9 @@ public protocol SMKCertificateValidator: SMKCertificateValidatorObjC {
// }
guard try serverCertificate.publicKey.verifySignature(message: senderCertificate.certificateBytes,
signature: senderCertificate.signatureBytes) else {
Logger.error("Sender certificate signature verification failed.")
OWSLog.error("Sender certificate signature verification failed.")
let error = SMKCertificateError.invalidCertificate(description: "Sender certificate signature verification failed.")
Logger.error("\(error)")
OWSLog.error("\(error)")
throw error
}
@ -64,7 +64,7 @@ public protocol SMKCertificateValidator: SMKCertificateValidatorObjC {
// }
guard validationTime <= senderCertificate.expiration else {
let error = SMKCertificateError.invalidCertificate(description: "Certficate is expired.")
Logger.error("\(error)")
OWSLog.error("\(error)")
throw error
}
@ -82,7 +82,7 @@ public protocol SMKCertificateValidator: SMKCertificateValidatorObjC {
guard try trustRoot.key.verifySignature(message: serverCertificate.certificateBytes,
signature: serverCertificate.signatureBytes) else {
let error = SMKCertificateError.invalidCertificate(description: "Server certificate signature verification failed.")
Logger.error("\(error)")
OWSLog.error("\(error)")
throw error
}
@ -91,7 +91,7 @@ public protocol SMKCertificateValidator: SMKCertificateValidatorObjC {
// }
guard !SMKCertificateDefaultValidator.kRevokedCertificateIds.contains(serverCertificate.keyId) else {
let error = SMKCertificateError.invalidCertificate(description: "Revoked certificate.")
Logger.error("\(error)")
OWSLog.error("\(error)")
throw error
}

2
SignalMetadataKit/src/SMKSecretSessionCipher.swift
View File

@ -241,7 +241,7 @@ fileprivate extension SMKMessageType {
guard !SMKAddress(senderAddress).matches(localAddress) ||
Int32(bitPattern: senderAddress.deviceId) != localDeviceId else {
Logger.info("Discarding self-sent message")
OWSLog.info("Discarding self-sent message")
throw SMKSecretSessionCipherError.selfSentMessage
}