From 01d804e2be59a7345ac2e9c9a35e0e27f87089d3 Mon Sep 17 00:00:00 2001 From: Jens Utbult Date: Tue, 12 Nov 2024 09:14:49 +0100 Subject: [PATCH] Change cbor data decoder method name to play better with swift. --- .../Connections/Shared/Sessions/FIDO2/CBOR/YKFCBORDecoder.h | 2 +- .../Connections/Shared/Sessions/FIDO2/CBOR/YKFCBORDecoder.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/YubiKit/YubiKit/Connections/Shared/Sessions/FIDO2/CBOR/YKFCBORDecoder.h b/YubiKit/YubiKit/Connections/Shared/Sessions/FIDO2/CBOR/YKFCBORDecoder.h index 84d3638c..9ab84a57 100644 --- a/YubiKit/YubiKit/Connections/Shared/Sessions/FIDO2/CBOR/YKFCBORDecoder.h +++ b/YubiKit/YubiKit/Connections/Shared/Sessions/FIDO2/CBOR/YKFCBORDecoder.h @@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN @returns The object or nil if the object could not be parsed. */ -+ (nullable id)decodeObjectFromData:(NSData *)data; ++ (nullable id)decodeDataObjectFrom:(NSData *)data; /*! @abstract diff --git a/YubiKit/YubiKit/Connections/Shared/Sessions/FIDO2/CBOR/YKFCBORDecoder.m b/YubiKit/YubiKit/Connections/Shared/Sessions/FIDO2/CBOR/YKFCBORDecoder.m index a033ae8b..b8ca9103 100644 --- a/YubiKit/YubiKit/Connections/Shared/Sessions/FIDO2/CBOR/YKFCBORDecoder.m +++ b/YubiKit/YubiKit/Connections/Shared/Sessions/FIDO2/CBOR/YKFCBORDecoder.m @@ -25,7 +25,7 @@ - (NSData *)dequeueBytes:(NSUInteger)numberOfBytes; @implementation YKFCBORDecoder -+ (nullable id)decodeObjectFromData:(NSData *)data { ++ (nullable id)decodeDataObjectFrom:(NSData *)data { NSInputStream *decoderInputStream = [[NSInputStream alloc] initWithData:data]; [decoderInputStream open]; id result = [YKFCBORDecoder decodeObjectFrom:decoderInputStream];