Send NSData instead of YKFAPDU as raw command.

Author: jensutbult

YubiKit/YubiKit/Connections/AccessoryConnection/YKFAccessoryConnection.m

@@ -182,13 +182,15 @@ - (void)managementSession:(YKFManagementSessionCompletion _Nonnull)callback {
     }];
 }
 
-- (void)executeRawCommand:(YKFAPDU *)apdu completion:(YKFRawComandCompletion)completion {
+- (void)executeRawCommand:(NSData *)data completion:(YKFRawComandCompletion)completion {
+    YKFAPDU *apdu = [[YKFAPDU alloc] initWithData:data];
     [self.connectionController execute:apdu completion:^(NSData * _Nullable data, NSError * _Nullable error, NSTimeInterval executionTime) {
         completion(data, error);
     }];
 }
 
-- (void)executeRawCommand:(YKFAPDU *)apdu timeout:(NSTimeInterval)timeout completion:(YKFRawComandCompletion)completion {
+- (void)executeRawCommand:(NSData *)data timeout:(NSTimeInterval)timeout completion:(YKFRawComandCompletion)completion {
+    YKFAPDU *apdu = [[YKFAPDU alloc] initWithData:data];
     [self.connectionController execute:apdu
                                timeout:timeout
                             completion:^(NSData * _Nullable response, NSError * _Nullable  error, NSTimeInterval executionTime) {

YubiKit/YubiKit/Connections/NFCConnection/YKFNFCConnection.m

@@ -138,13 +138,15 @@ - (void)managementSession:(YKFManagementSessionCompletion _Nonnull)callback {
     }];
 }
 
-- (void)executeRawCommand:(YKFAPDU *)apdu completion:(YKFRawComandCompletion)completion {
+- (void)executeRawCommand:(NSData *)data completion:(YKFRawComandCompletion)completion {
+    YKFAPDU *apdu = [[YKFAPDU alloc] initWithData:data];
     [self.connectionController execute:apdu completion:^(NSData * _Nullable data, NSError * _Nullable error, NSTimeInterval executionTime) {
         completion(data, error);
     }];
 }
 
-- (void)executeRawCommand:(YKFAPDU *)apdu timeout:(NSTimeInterval)timeout completion:(YKFRawComandCompletion)completion {
+- (void)executeRawCommand:(NSData *)data timeout:(NSTimeInterval)timeout completion:(YKFRawComandCompletion)completion {
+    YKFAPDU *apdu = [[YKFAPDU alloc] initWithData:data];
     [self.connectionController execute:apdu
                                timeout:timeout
                             completion:^(NSData * _Nullable  response, NSError * _Nullable error, NSTimeInterval executionTime) {

YubiKit/YubiKit/Connections/SmartCardConnection/YKFSmartCardConnection.m

@@ -169,13 +169,15 @@ - (void)u2fSession:(YKFU2FSessionCompletionBlock _Nonnull)completion {
                                            userInfo:@{NSLocalizedDescriptionKey: @"U2F session not supported by YKFSmartCardConnection."}]);
 }
 
-- (void)executeRawCommand:(YKFAPDU *)apdu completion:(YKFRawComandCompletion)completion {
+- (void)executeRawCommand:(NSData *)data completion:(YKFRawComandCompletion)completion {
+    YKFAPDU *apdu = [[YKFAPDU alloc] initWithData:data];
     [self.connectionController execute:apdu completion:^(NSData * _Nullable data, NSError * _Nullable error, NSTimeInterval executionTime) {
         completion(data, error);
     }];
 }
 
-- (void)executeRawCommand:(YKFAPDU *)apdu timeout:(NSTimeInterval)timeout completion:(YKFRawComandCompletion)completion {
+- (void)executeRawCommand:(NSData *)data timeout:(NSTimeInterval)timeout completion:(YKFRawComandCompletion)completion {
+    YKFAPDU *apdu = [[YKFAPDU alloc] initWithData:data];
     [self.connectionController execute:apdu
                                timeout:timeout
                             completion:^(NSData * _Nullable response, NSError * _Nullable  error, NSTimeInterval executionTime) {

YubiKit/YubiKit/Connections/YKFConnectionProtocol.h

@@ -73,15 +73,15 @@ typedef void (^YKFRawComandCompletion)(NSData *_Nullable, NSError *_Nullable);
 /// @param completion The unparsed result from the YubiKey or an error.
 /// @discussion Use this for communicating with the YubiKey by sending APDUs to the it. Only use this
 ///             when the `SmartCardInterface` or any of the supplied sessions can not be used.
-- (void)executeRawCommand:(YKFAPDU *_Nonnull)apdu completion:(YKFRawComandCompletion _Nonnull)completion;
+- (void)executeRawCommand:(NSData *_Nonnull)apdu completion:(YKFRawComandCompletion _Nonnull)completion;
 
-/// @abstract Send a APDU and get the unparsed result as an NSData from the YubiKey.
-/// @param apdu The APDU to send to the YubiKey.
+/// @abstract Send command as NSData and get the unparsed result as an NSData from the YubiKey.
+/// @param data The NSData to send to the YubiKey.
 /// @param timeout The timeout to wait before cancelling the command sent to the YubiKey.
 /// @param completion The unparsed result from the YubiKey or an error.
 /// @discussion Use this for communicating with the YubiKey by sending APDUs to the it. Only use this
 ///             when the `SmartCardInterface` or any of the supplied sessions can not be used.
-- (void)executeRawCommand:(YKFAPDU *_Nonnull)apdu timeout:(NSTimeInterval)timeout completion:(YKFRawComandCompletion _Nonnull)completion;
+- (void)executeRawCommand:(NSData *_Nonnull)data timeout:(NSTimeInterval)timeout completion:(YKFRawComandCompletion _Nonnull)completion;
 
 @end
 

YubiKitTests/Tests/ConnectionTests.swift

@@ -118,10 +118,10 @@ class ConnectionTests: XCTestCase {
         Thread.sleep(forTimeInterval: 0.5)
         firstConnection.connection { connection, error in
             // Select Management application
-            let data = Data([0xA0, 0x00, 0x00, 0x05, 0x27, 0x47, 0x11, 0x17])
-            let apdu = YKFAPDU(cla: 0x00, ins: 0xa4, p1: 0x04, p2: 0x00, data: data, type: .short)!
-            connection.executeRawCommand(apdu) { data, error in
+            let data = Data([0x00, 0xa4, 0x04, 0x00, 0x08, 0xa0, 0x00, 0x00, 0x05, 0x27, 0x47, 0x11, 0x17])
+            connection.executeRawCommand(data) { data, error in
                 guard let data else { XCTFail("Failed with error: \(error!)"); return }
+                print(data.hexDescription)
                 XCTAssertEqual(data.statusCode, 0x9000)
                 connectionExpectation.fulfill()
             }