From b4b1dbad1f60ec583206904d59688e662894bae9 Mon Sep 17 00:00:00 2001 From: Joey GM Date: Sat, 22 Apr 2023 20:14:43 +0800 Subject: [PATCH] Add inequality operator ( != ) for digest and DataProtocol comparison --- Sources/Crypto/Digests/Digest.swift | 22 +++++++++++++++++--- Tests/CryptoTests/Digests/DigestsTests.swift | 7 +++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Sources/Crypto/Digests/Digest.swift b/Sources/Crypto/Digests/Digest.swift index 49f947f8..61c62b6a 100644 --- a/Sources/Crypto/Digests/Digest.swift +++ b/Sources/Crypto/Digests/Digest.swift @@ -11,10 +11,11 @@ // SPDX-License-Identifier: Apache-2.0 // //===----------------------------------------------------------------------===// +import Foundation + #if (os(macOS) || os(iOS) || os(watchOS) || os(tvOS)) && CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API @_exported import CryptoKit #else -import Foundation /// A protocol defining requirements for digests public protocol Digest: Hashable, ContiguousBytes, CustomStringConvertible, Sequence where Element == UInt8 { @@ -52,7 +53,7 @@ extension Digest { extension Digest { public static func == (lhs: Self, rhs: Self) -> Bool { return safeCompare(lhs, rhs) - } + } public static func == (lhs: Self, rhs: D) -> Bool { if rhs.regions.count != 1 { @@ -62,9 +63,24 @@ extension Digest { return safeCompare(lhs, rhs.regions.first!) } } - + public var description: String { return "\(Self.self): \(Array(self).hexString)" } } #endif // Linux or !SwiftPM + +extension Digest { + + /// Determines whether a digest is not equal to a collection of contiguous bytes. + /// + /// - Parameters: + /// - lhs: A digest to compare. + /// - rhs: A collection of contiguous bytes to compare. + /// + /// - Returns: A Boolean value that’s `true` if the digest is not equal to the collection of binary data. + public static func != (lhs: Self, rhs: D) -> Bool { + return !(lhs == rhs) + } + +} diff --git a/Tests/CryptoTests/Digests/DigestsTests.swift b/Tests/CryptoTests/Digests/DigestsTests.swift index 672518ae..a6d65729 100644 --- a/Tests/CryptoTests/Digests/DigestsTests.swift +++ b/Tests/CryptoTests/Digests/DigestsTests.swift @@ -121,4 +121,11 @@ class DigestsTests: XCTestCase { XCTAssertEqual(SHA384.blockByteCount, 128) XCTAssertEqual(SHA512.blockByteCount, 128) } + + func testComparisonOperators() { + XCTAssertTrue(SHA256.hash(data: [1, 2, 3, 4]) == SHA256.hash(data: [1, 2, 3, 4])) + XCTAssertTrue(SHA256.hash(data: [1, 2, 3, 4]) != SHA256.hash(data: [5, 6, 7, 8])) + XCTAssertTrue(SHA256.hash(data: [1, 2, 3, 4]) == Data(SHA256.hash(data: [1, 2, 3, 4]))) + XCTAssertTrue(SHA256.hash(data: [1, 2, 3, 4]) != Data(SHA256.hash(data: [5, 6, 7, 8]))) + } }