From e9f692bd4cb2f88fd546830c5ab0e811cc7b3b5d Mon Sep 17 00:00:00 2001 From: Yaroslav Yashin Date: Tue, 28 Jan 2025 23:42:51 +0100 Subject: [PATCH] refactor: remove forceCiphersuitesAESCBC property from OpenVPNConfiguration `forceCiphersuitesAESCBC` property was deleted from OpenVPN3, its last mention is here 11caf5fc6b9d48af6a4f1b2ad2e10e7874c60f3b. So these changes are making OpenVPNAdapter in par with the lib's state. --- Sources/OpenVPNAdapter/library/OpenVPNConfiguration.h | 11 +---------- .../OpenVPNAdapter/library/OpenVPNConfiguration.mm | 3 --- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Sources/OpenVPNAdapter/library/OpenVPNConfiguration.h b/Sources/OpenVPNAdapter/library/OpenVPNConfiguration.h index c74dcc5..3fb0314 100644 --- a/Sources/OpenVPNAdapter/library/OpenVPNConfiguration.h +++ b/Sources/OpenVPNAdapter/library/OpenVPNConfiguration.h @@ -138,15 +138,6 @@ typedef NS_ENUM(NSInteger, OpenVPNTLSCertProfile); */ @property (nonatomic) NSInteger keyDirection; -/** - If YES, force ciphersuite to be one of: - 1. TLS_DHE_RSA_WITH_AES_256_CBC_SHA, or - 2. TLS_DHE_RSA_WITH_AES_128_CBC_SHA - and disable setting TLS minimum version. - This is intended for compatibility with legacy systems. - */ -@property (nonatomic) BOOL forceCiphersuitesAESCBC; - /** Override the minimum TLS version */ @@ -183,7 +174,7 @@ typedef NS_ENUM(NSInteger, OpenVPNTLSCertProfile); @property (nonatomic) BOOL info; /** - Periodic convenience clock tick in milliseconds. Will call + Periodic convenience clock tick in milliseconds. Will call [OpenVPNAdapterDelegate tick] at a frequency defined by this parameter. Set to 0 to disable. */ diff --git a/Sources/OpenVPNAdapter/library/OpenVPNConfiguration.mm b/Sources/OpenVPNAdapter/library/OpenVPNConfiguration.mm index d7b8f56..975054b 100644 --- a/Sources/OpenVPNAdapter/library/OpenVPNConfiguration.mm +++ b/Sources/OpenVPNAdapter/library/OpenVPNConfiguration.mm @@ -542,7 +542,6 @@ NSString *const OpenVPNTLSCertProfileDefaultValue = @"default"; configuration.compressionMode = self.compressionMode; configuration.privateKeyPassword = [self.privateKeyPassword copyWithZone:zone]; configuration.keyDirection = self.keyDirection; - configuration.forceCiphersuitesAESCBC = self.forceCiphersuitesAESCBC; configuration.minTLSVersion = self.minTLSVersion; configuration.tlsCertProfile = self.tlsCertProfile; configuration.peerInfo = [self.peerInfo copyWithZone:zone]; @@ -572,7 +571,6 @@ NSString *const OpenVPNTLSCertProfileDefaultValue = @"default"; [aCoder encodeInteger:self.compressionMode forKey:NSStringFromSelector(@selector(compressionMode))]; [aCoder encodeObject:self.privateKeyPassword forKey:NSStringFromSelector(@selector(privateKeyPassword))]; [aCoder encodeInteger:self.keyDirection forKey:NSStringFromSelector(@selector(keyDirection))]; - [aCoder encodeBool:self.forceCiphersuitesAESCBC forKey:NSStringFromSelector(@selector(forceCiphersuitesAESCBC))]; [aCoder encodeInteger:self.minTLSVersion forKey:NSStringFromSelector(@selector(minTLSVersion))]; [aCoder encodeInteger:self.tlsCertProfile forKey:NSStringFromSelector(@selector(tlsCertProfile))]; [aCoder encodeObject:self.peerInfo forKey:NSStringFromSelector(@selector(peerInfo))]; @@ -602,7 +600,6 @@ NSString *const OpenVPNTLSCertProfileDefaultValue = @"default"; self.compressionMode = (OpenVPNCompressionMode)[aDecoder decodeIntegerForKey:NSStringFromSelector(@selector(compressionMode))]; self.privateKeyPassword = [aDecoder decodeObjectOfClass:[NSString class] forKey:NSStringFromSelector(@selector(privateKeyPassword))]; self.keyDirection = [aDecoder decodeIntegerForKey:NSStringFromSelector(@selector(keyDirection))]; - self.forceCiphersuitesAESCBC = [aDecoder decodeBoolForKey:NSStringFromSelector(@selector(forceCiphersuitesAESCBC))]; self.minTLSVersion = (OpenVPNMinTLSVersion)[aDecoder decodeIntegerForKey:NSStringFromSelector(@selector(minTLSVersion))]; self.tlsCertProfile = (OpenVPNTLSCertProfile)[aDecoder decodeIntegerForKey:NSStringFromSelector(@selector(tlsCertProfile))]; self.peerInfo = [aDecoder decodeObjectOfClass:[NSDictionary class] forKey:NSStringFromSelector(@selector(peerInfo))];