From 94890c08cf073a2108f9608faa2fc153d5afc979 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Fri, 24 Aug 2018 00:47:19 +0200 Subject: [PATCH] Do not deprecate until replacement Implement new compression framing later. --- .../AppExtension/TunnelKitProvider+Configuration.swift | 2 +- TunnelKit/Sources/Core/CryptoAEAD.h | 2 +- TunnelKit/Sources/Core/CryptoCBC.h | 2 +- TunnelKit/Sources/Core/DataPath.h | 2 +- TunnelKit/Sources/Core/DataPathEncryption.h | 4 ++-- TunnelKit/Sources/Core/SessionProxy+Configuration.swift | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/TunnelKit/Sources/AppExtension/TunnelKitProvider+Configuration.swift b/TunnelKit/Sources/AppExtension/TunnelKitProvider+Configuration.swift index 870c4c4..199068a 100644 --- a/TunnelKit/Sources/AppExtension/TunnelKitProvider+Configuration.swift +++ b/TunnelKit/Sources/AppExtension/TunnelKitProvider+Configuration.swift @@ -129,7 +129,7 @@ extension TunnelKitProvider { public var mtu: NSNumber /// Enables LZO framing (deprecated). - @available(*, deprecated) +// @available(*, deprecated) public var LZOFraming: Bool /// The number of seconds after which a renegotiation is started. Set to `nil` to disable renegotiation (default). diff --git a/TunnelKit/Sources/Core/CryptoAEAD.h b/TunnelKit/Sources/Core/CryptoAEAD.h index 1869c99..4eaca47 100644 --- a/TunnelKit/Sources/Core/CryptoAEAD.h +++ b/TunnelKit/Sources/Core/CryptoAEAD.h @@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN @interface DataPathCryptoAEAD : NSObject @property (nonatomic, assign) uint32_t peerId; -@property (nonatomic, assign) BOOL LZOFraming DEPRECATED_ATTRIBUTE; +@property (nonatomic, assign) BOOL LZOFraming;// DEPRECATED_ATTRIBUTE; - (instancetype)initWithCrypto:(nonnull CryptoAEAD *)crypto; diff --git a/TunnelKit/Sources/Core/CryptoCBC.h b/TunnelKit/Sources/Core/CryptoCBC.h index 0c9e553..4af8175 100644 --- a/TunnelKit/Sources/Core/CryptoCBC.h +++ b/TunnelKit/Sources/Core/CryptoCBC.h @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN @interface DataPathCryptoCBC : NSObject @property (nonatomic, assign) uint32_t peerId; -@property (nonatomic, assign) BOOL LZOFraming DEPRECATED_ATTRIBUTE; +@property (nonatomic, assign) BOOL LZOFraming;// DEPRECATED_ATTRIBUTE; - (instancetype)initWithCrypto:(nonnull CryptoCBC *)crypto; diff --git a/TunnelKit/Sources/Core/DataPath.h b/TunnelKit/Sources/Core/DataPath.h index 53e82fc..a898747 100644 --- a/TunnelKit/Sources/Core/DataPath.h +++ b/TunnelKit/Sources/Core/DataPath.h @@ -23,7 +23,7 @@ usesReplayProtection:(BOOL)usesReplayProtection; - (void)setPeerId:(uint32_t)peerId; // 24-bit, discard most significant byte -- (void)setLZOFraming:(BOOL)LZOFraming DEPRECATED_ATTRIBUTE; +- (void)setLZOFraming:(BOOL)LZOFraming;// DEPRECATED_ATTRIBUTE; - (NSArray *)encryptPackets:(nonnull NSArray *)packets key:(uint8_t)key error:(NSError **)error; - (NSArray *)decryptPackets:(nonnull NSArray *)packets keepAlive:(nullable bool *)keepAlive error:(NSError **)error; diff --git a/TunnelKit/Sources/Core/DataPathEncryption.h b/TunnelKit/Sources/Core/DataPathEncryption.h index 4c18723..a7171e7 100644 --- a/TunnelKit/Sources/Core/DataPathEncryption.h +++ b/TunnelKit/Sources/Core/DataPathEncryption.h @@ -13,8 +13,8 @@ - (int)overheadLength; - (uint32_t)peerId; - (void)setPeerId:(uint32_t)peerId; -- (BOOL)LZOFraming DEPRECATED_ATTRIBUTE; -- (void)setLZOFraming:(BOOL)LZOFraming DEPRECATED_ATTRIBUTE; +- (BOOL)LZOFraming;// DEPRECATED_ATTRIBUTE; +- (void)setLZOFraming:(BOOL)LZOFraming;// DEPRECATED_ATTRIBUTE; @end diff --git a/TunnelKit/Sources/Core/SessionProxy+Configuration.swift b/TunnelKit/Sources/Core/SessionProxy+Configuration.swift index 112b650..a0ccae5 100644 --- a/TunnelKit/Sources/Core/SessionProxy+Configuration.swift +++ b/TunnelKit/Sources/Core/SessionProxy+Configuration.swift @@ -59,7 +59,7 @@ extension SessionProxy { public var caPath: String? /// Enables LZO compression framing (deprecated in OpenVPN 2.4). - @available(*, deprecated) +// @available(*, deprecated) public var LZOFraming: Bool /// Sends periodical keep-alive packets if set.