Version 5.1.0

Author: Gematik-Entwicklung

Cartfile

@@ -1,4 +1,4 @@
 github "gematik/ref-GemCommonsKit" ~> 1.3
-github "gematik/asn1kit" ~> 1.1
-github "gematik/OpenSSL-Swift" ~> 3.0
+github "gematik/ASN1Kit" ~> 1.1
+github "gematik/OpenSSL-Swift" ~> 4.0
 github "SwiftCommon/DataKit" ~> 1.0

Cartfile.resolved

@@ -1,8 +1,8 @@
-github "gematik/asn1kit" "1.1.0"
-github "gematik/ref-GemCommonsKit" "1.3.0"
 github "Quick/Nimble" "v9.2.1"
 github "SwiftCommon/DataKit" "1.1.0"
-github "gematik/OpenSSL-Swift" "3.0.3"
+github "gematik/ASN1Kit" "1.1.0"
+github "gematik/OpenSSL-Swift" "4.0.0"
+github "gematik/ref-GemCommonsKit" "1.3.0"
 github "hectr/swift-stream-reader" "0.3.0"
 github "swiftsocket/SwiftSocket" "2e6ba27140a29fae8a6331ba4463312e0c71a6b0"
 github "tadija/AEXML" "4.6.1"

OpenHealthCardKit.xcodeproj/project.pbxproj

@@ -4445,7 +4445,7 @@
 			repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.9.0;
+				minimumVersion = 1.10.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

ReleaseNotes.md

@@ -101,6 +101,10 @@ extension ApplicationIdentifier {
          - Parameter value: The StringLiteral to be used as rawValue
      */
     public init(stringLiteral value: StringLiteralType) {
-        try! self.init(hex: value) // swiftlint:disable:this force_try
+        do {
+            try self.init(hex: value)
+        } catch {
+            preconditionFailure(error.localizedDescription)
+        }
     }
 }

Sources/HealthCardAccess/CardObjects/ApplicationIdentifier.swift

@@ -19,6 +19,7 @@ import Foundation
 import HealthCardAccess
 import Helper
 
+@frozen
 public enum ChangeReferenceDataResponse: Equatable {
     /// Reset successful
     case success

Sources/HealthCardControl/Authentication/HealthCardType+ChangeReferenceData.swift

@@ -19,6 +19,7 @@ import Foundation
 import HealthCardAccess
 import Helper
 
+@frozen
 public enum ResetRetryCounterResponse: Equatable {
     /// Reset successful
     case success

Sources/HealthCardControl/Authentication/HealthCardType+ResetRetryCounter.swift

@@ -91,7 +91,7 @@ extension HealthCardType {
                             .eraseToAnyPublisher()
                         } else {
                             // Done
-                            return Just(responseData).mapError { $0 as Error }.eraseToAnyPublisher()
+                            return Just(responseData).setFailureType(to: Error.self).eraseToAnyPublisher()
                         }
                     }
             }

Sources/HealthCardControl/Operations/HealthCardType+ReadFile.swift

@@ -67,7 +67,7 @@ public enum KeyAgreement { // swiftlint:disable:this type_body_length
         /// Negotiate a common key with a `HealthCard` given its `CardAccessNumber`
         ///
         /// - Parameters:
-        ///     - channel: the channel to negotiate a session key with
+        ///     - card: the card to negotiate a session key with
         ///     - can: the `CardAccessNumber` of the `HealthCard`
         ///     - writeTimeout: timeout in seconds. time <= 0 is no timeout
         ///     - readTimeout: timeout in seconds. time <= 0 is no timeout
@@ -174,9 +174,7 @@ public enum KeyAgreement { // swiftlint:disable:this type_body_length
         readTimeout: TimeInterval
     ) -> AnyPublisher<Data, Swift.Error> {
         Just(HealthCardCommand.PACE.step1a())
-            .mapError {
-                $0 as Swift.Error
-            }
+            .setFailureType(to: Swift.Error.self)
             .flatMap {
                 $0.publisher(for: card, writeTimeout: writeTimeout, readTimeout: readTimeout)
             }
@@ -206,15 +204,15 @@ public enum KeyAgreement { // swiftlint:disable:this type_body_length
     ) -> AnyPublisher<(BrainpoolP256r1.KeyExchange.PublicKey, BrainpoolP256r1.KeyExchange.PrivateKey), Swift.Error> {
         Deferred { () -> AnyPublisher<BrainpoolP256r1.KeyExchange.PrivateKey, Swift.Error> in
             do {
-                return Just(try BrainpoolP256r1.KeyExchange.generateKey(compactRepresentable: false))
+                return Just(try BrainpoolP256r1.KeyExchange.generateKey())
                     .setFailureType(to: Swift.Error.self)
                     .eraseToAnyPublisher()
             } catch {
                 return Fail(error: error).eraseToAnyPublisher()
             }
         }
         .tryMap { keyPair1 in
-            let command = try HealthCardCommand.PACE.step2a(publicKey: keyPair1.publicKey.x962Value)
+            let command = try HealthCardCommand.PACE.step2a(publicKey: keyPair1.publicKey.x962Value())
             return (keyPair1, command)
         }
         .flatMap { (keyPair1: BrainpoolP256r1.KeyExchange.PrivateKey, command: HealthCardCommandType) in
@@ -244,7 +242,7 @@ public enum KeyAgreement { // swiftlint:disable:this type_body_length
     ) -> AnyPublisher<(BrainpoolP256r1.KeyExchange.PublicKey, AES128PaceKey), Swift.Error> {
         Just(pk2Pcd)
             .tryMap { pk2Pcd -> HealthCardCommandType in
-                try HealthCardCommand.PACE.step3a(publicKey: pk2Pcd.x962Value)
+                try HealthCardCommand.PACE.step3a(publicKey: pk2Pcd.x962Value())
             }
             .flatMap {
                 $0.publisher(for: card, writeTimeout: writeTimeout, readTimeout: readTimeout)
@@ -275,7 +273,7 @@ public enum KeyAgreement { // swiftlint:disable:this type_body_length
         let algorithm = Algorithm.idPaceEcdhGmAesCbcCmac128
         return Just(algorithm)
             .tryMap { algorithm -> HealthCardCommandType in
-                let macPcd = try KeyAgreement.deriveMac(publicKeyX509: pk2Picc.x962Value,
+                let macPcd = try KeyAgreement.deriveMac(publicKeyX509: pk2Picc.x962Value(),
                                                         sessionKeyMac: paceKey.mac,
                                                         algorithm: algorithm)
                 let macPcdToken = macPcd.prefix(algorithm.macTokenPrefixSize)
@@ -292,7 +290,7 @@ public enum KeyAgreement { // swiftlint:disable:this type_body_length
                     throw Error.unexpectedFormedAnswerFromCard
                 }
                 let macPiccData = try extractPrimitive(constructedAsn1: macPiccResponseData)
-                let verifyMacPiccData = try deriveMac(publicKeyX509: pk2Pcd.x962Value,
+                let verifyMacPiccData = try deriveMac(publicKeyX509: pk2Pcd.x962Value(),
                                                       sessionKeyMac: paceKey.mac,
                                                       algorithm: algorithm)
 

Sources/HealthCardControl/SecureMessaging/KeyAgreement.swift

@@ -17,6 +17,7 @@
 import CoreNFC
 import Foundation
 
+@frozen
 public enum CoreNFCError: Swift.Error {
     case tagConnectionLost(NFCReaderError)
     case sessionTimeout(NFCReaderError)