Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename pemXxx parameters to PEMXxx

Browse Source
pull/16190/head
Muxi Yan 6 years ago
parent 2c1c22c3f1
commit 0fc040d19a
10 changed files with 76 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/objective-c/GRPCClient/GRPCCallOptions.h
  2. 84
      src/objective-c/GRPCClient/GRPCCallOptions.m
  3. 24
      src/objective-c/GRPCClient/private/GRPCChannelPool.m
  4. 14
      src/objective-c/GRPCClient/private/GRPCHost.m
  5. 2
      src/objective-c/tests/InteropTests.h
  6. 8
      src/objective-c/tests/InteropTests.m
  7. 2
      src/objective-c/tests/InteropTestsLocalCleartext.m
  8. 2
      src/objective-c/tests/InteropTestsLocalSSL.m
  9. 2
      src/objective-c/tests/InteropTestsMultipleChannels/InteropTestsMultipleChannels.m
  10. 2
      src/objective-c/tests/InteropTestsRemote.m

12
src/objective-c/GRPCClient/GRPCCallOptions.h
Unescape View File

@ -146,17 +146,17 @@ typedef NS_ENUM(NSInteger, GRPCTransportType) {
* PEM format root certifications that is trusted. If set to nil, gRPC uses a list of default * PEM format root certifications that is trusted. If set to nil, gRPC uses a list of default
* root certificates. * root certificates.
*/ */
@property(copy, readonly) NSString *pemRootCert; @property(copy, readonly) NSString *PEMRootCertificates;
/** /**
* PEM format private key for client authentication, if required by the server. * PEM format private key for client authentication, if required by the server.
*/ */
@property(copy, readonly) NSString *pemPrivateKey; @property(copy, readonly) NSString *PEMPrivateKey;
/** /**
* PEM format certificate chain for client authentication, if required by the server. * PEM format certificate chain for client authentication, if required by the server.
*/ */
@property(copy, readonly) NSString *pemCertChain; @property(copy, readonly) NSString *PEMCertChain;
/** /**
* Select the transport type to be used for this call. * Select the transport type to be used for this call.
@ -278,17 +278,17 @@ typedef NS_ENUM(NSInteger, GRPCTransportType) {
* PEM format root certifications that is trusted. If set to nil, gRPC uses a list of default * PEM format root certifications that is trusted. If set to nil, gRPC uses a list of default
* root certificates. * root certificates.
*/ */
@property(copy, readwrite) NSString *pemRootCert; @property(copy, readwrite) NSString *PEMRootCertificates;
/** /**
* PEM format private key for client authentication, if required by the server. * PEM format private key for client authentication, if required by the server.
*/ */
@property(copy, readwrite) NSString *pemPrivateKey; @property(copy, readwrite) NSString *PEMPrivateKey;
/** /**
* PEM format certificate chain for client authentication, if required by the server. * PEM format certificate chain for client authentication, if required by the server.
*/ */
@property(copy, readwrite) NSString *pemCertChain; @property(copy, readwrite) NSString *PEMCertChain;
/** /**
* Select the transport type to be used for this call. * Select the transport type to be used for this call.

84
src/objective-c/GRPCClient/GRPCCallOptions.m
Unescape View File

@ -32,9 +32,9 @@ static const NSTimeInterval kDefaultConnectMinTimeout = 0;
static const NSTimeInterval kDefaultConnectInitialBackoff = 0; static const NSTimeInterval kDefaultConnectInitialBackoff = 0;
static const NSTimeInterval kDefaultConnectMaxBackoff = 0; static const NSTimeInterval kDefaultConnectMaxBackoff = 0;
static NSDictionary *const kDefaultAdditionalChannelArgs = nil; static NSDictionary *const kDefaultAdditionalChannelArgs = nil;
static NSString *const kDefaultPemRootCert = nil; static NSString *const kDefaultPEMRootCertificates = nil;
static NSString *const kDefaultPemPrivateKey = nil; static NSString *const kDefaultPEMPrivateKey = nil;
static NSString *const kDefaultPemCertChain = nil; static NSString *const kDefaultPEMCertChain = nil;
static NSString *const kDefaultOauth2AccessToken = nil; static NSString *const kDefaultOauth2AccessToken = nil;
static const id<GRPCAuthorizationProtocol> kDefaultAuthTokenProvider = nil; static const id<GRPCAuthorizationProtocol> kDefaultAuthTokenProvider = nil;
static const GRPCTransportType kDefaultTransportType = GRPCTransportTypeChttp2BoringSSL; static const GRPCTransportType kDefaultTransportType = GRPCTransportTypeChttp2BoringSSL;
@ -60,9 +60,9 @@ static NSUInteger kDefaultChannelId = 0;
NSTimeInterval _connectInitialBackoff; NSTimeInterval _connectInitialBackoff;
NSTimeInterval _connectMaxBackoff; NSTimeInterval _connectMaxBackoff;
NSDictionary *_additionalChannelArgs; NSDictionary *_additionalChannelArgs;
NSString *_pemRootCert; NSString *_PEMRootCertificates;
NSString *_pemPrivateKey; NSString *_PEMPrivateKey;
NSString *_pemCertChain; NSString *_PEMCertChain;
GRPCTransportType _transportType; GRPCTransportType _transportType;
NSString *_hostNameOverride; NSString *_hostNameOverride;
id _logContext; id _logContext;
@ -85,9 +85,9 @@ static NSUInteger kDefaultChannelId = 0;
@synthesize connectInitialBackoff = _connectInitialBackoff; @synthesize connectInitialBackoff = _connectInitialBackoff;
@synthesize connectMaxBackoff = _connectMaxBackoff; @synthesize connectMaxBackoff = _connectMaxBackoff;
@synthesize additionalChannelArgs = _additionalChannelArgs; @synthesize additionalChannelArgs = _additionalChannelArgs;
@synthesize pemRootCert = _pemRootCert; @synthesize PEMRootCertificates = _PEMRootCertificates;
@synthesize pemPrivateKey = _pemPrivateKey; @synthesize PEMPrivateKey = _PEMPrivateKey;
@synthesize pemCertChain = _pemCertChain; @synthesize PEMCertChain = _PEMCertChain;
@synthesize transportType = _transportType; @synthesize transportType = _transportType;
@synthesize hostNameOverride = _hostNameOverride; @synthesize hostNameOverride = _hostNameOverride;
@synthesize logContext = _logContext; @synthesize logContext = _logContext;
@ -110,9 +110,9 @@ static NSUInteger kDefaultChannelId = 0;
connectInitialBackoff:kDefaultConnectInitialBackoff connectInitialBackoff:kDefaultConnectInitialBackoff
connectMaxBackoff:kDefaultConnectMaxBackoff connectMaxBackoff:kDefaultConnectMaxBackoff
additionalChannelArgs:kDefaultAdditionalChannelArgs additionalChannelArgs:kDefaultAdditionalChannelArgs
pemRootCert:kDefaultPemRootCert PEMRootCertificates:kDefaultPEMRootCertificates
pemPrivateKey:kDefaultPemPrivateKey PEMPrivateKey:kDefaultPEMPrivateKey
pemCertChain:kDefaultPemCertChain PEMCertChain:kDefaultPEMCertChain
transportType:kDefaultTransportType transportType:kDefaultTransportType
hostNameOverride:kDefaultHostNameOverride hostNameOverride:kDefaultHostNameOverride
logContext:kDefaultLogContext logContext:kDefaultLogContext
@ -135,9 +135,9 @@ static NSUInteger kDefaultChannelId = 0;
connectInitialBackoff:(NSTimeInterval)connectInitialBackoff connectInitialBackoff:(NSTimeInterval)connectInitialBackoff
connectMaxBackoff:(NSTimeInterval)connectMaxBackoff connectMaxBackoff:(NSTimeInterval)connectMaxBackoff
additionalChannelArgs:(NSDictionary *)additionalChannelArgs additionalChannelArgs:(NSDictionary *)additionalChannelArgs
pemRootCert:(NSString *)pemRootCert PEMRootCertificates:(NSString *)PEMRootCertificates
pemPrivateKey:(NSString *)pemPrivateKey PEMPrivateKey:(NSString *)PEMPrivateKey
pemCertChain:(NSString *)pemCertChain PEMCertChain:(NSString *)PEMCertChain
transportType:(GRPCTransportType)transportType transportType:(GRPCTransportType)transportType
hostNameOverride:(NSString *)hostNameOverride hostNameOverride:(NSString *)hostNameOverride
logContext:(id)logContext logContext:(id)logContext
@ -159,9 +159,9 @@ static NSUInteger kDefaultChannelId = 0;
_connectInitialBackoff = connectInitialBackoff; _connectInitialBackoff = connectInitialBackoff;
_connectMaxBackoff = connectMaxBackoff; _connectMaxBackoff = connectMaxBackoff;
_additionalChannelArgs = additionalChannelArgs; _additionalChannelArgs = additionalChannelArgs;
_pemRootCert = pemRootCert; _PEMRootCertificates = PEMRootCertificates;
_pemPrivateKey = pemPrivateKey; _PEMPrivateKey = PEMPrivateKey;
_pemCertChain = pemCertChain; _PEMCertChain = PEMCertChain;
_transportType = transportType; _transportType = transportType;
_hostNameOverride = hostNameOverride; _hostNameOverride = hostNameOverride;
_logContext = logContext; _logContext = logContext;
@ -188,9 +188,9 @@ static NSUInteger kDefaultChannelId = 0;
connectInitialBackoff:_connectInitialBackoff connectInitialBackoff:_connectInitialBackoff
connectMaxBackoff:_connectMaxBackoff connectMaxBackoff:_connectMaxBackoff
additionalChannelArgs:[_additionalChannelArgs copy] additionalChannelArgs:[_additionalChannelArgs copy]
pemRootCert:_pemRootCert PEMRootCertificates:_PEMRootCertificates
pemPrivateKey:_pemPrivateKey PEMPrivateKey:_PEMPrivateKey
pemCertChain:_pemCertChain PEMCertChain:_PEMCertChain
transportType:_transportType transportType:_transportType
hostNameOverride:_hostNameOverride hostNameOverride:_hostNameOverride
logContext:_logContext logContext:_logContext
@ -216,9 +216,9 @@ static NSUInteger kDefaultChannelId = 0;
connectInitialBackoff:_connectInitialBackoff connectInitialBackoff:_connectInitialBackoff
connectMaxBackoff:_connectMaxBackoff connectMaxBackoff:_connectMaxBackoff
additionalChannelArgs:[_additionalChannelArgs copy] additionalChannelArgs:[_additionalChannelArgs copy]
pemRootCert:_pemRootCert PEMRootCertificates:_PEMRootCertificates
pemPrivateKey:_pemPrivateKey PEMPrivateKey:_PEMPrivateKey
pemCertChain:_pemCertChain PEMCertChain:_PEMCertChain
transportType:_transportType transportType:_transportType
hostNameOverride:_hostNameOverride hostNameOverride:_hostNameOverride
logContext:_logContext logContext:_logContext
@ -246,9 +246,9 @@ static NSUInteger kDefaultChannelId = 0;
@dynamic connectInitialBackoff; @dynamic connectInitialBackoff;
@dynamic connectMaxBackoff; @dynamic connectMaxBackoff;
@dynamic additionalChannelArgs; @dynamic additionalChannelArgs;
@dynamic pemRootCert; @dynamic PEMRootCertificates;
@dynamic pemPrivateKey; @dynamic PEMPrivateKey;
@dynamic pemCertChain; @dynamic PEMCertChain;
@dynamic transportType; @dynamic transportType;
@dynamic hostNameOverride; @dynamic hostNameOverride;
@dynamic logContext; @dynamic logContext;
@ -271,9 +271,9 @@ static NSUInteger kDefaultChannelId = 0;
connectInitialBackoff:kDefaultConnectInitialBackoff connectInitialBackoff:kDefaultConnectInitialBackoff
connectMaxBackoff:kDefaultConnectMaxBackoff connectMaxBackoff:kDefaultConnectMaxBackoff
additionalChannelArgs:kDefaultAdditionalChannelArgs additionalChannelArgs:kDefaultAdditionalChannelArgs
pemRootCert:kDefaultPemRootCert PEMRootCertificates:kDefaultPEMRootCertificates
pemPrivateKey:kDefaultPemPrivateKey PEMPrivateKey:kDefaultPEMPrivateKey
pemCertChain:kDefaultPemCertChain PEMCertChain:kDefaultPEMCertChain
transportType:kDefaultTransportType transportType:kDefaultTransportType
hostNameOverride:kDefaultHostNameOverride hostNameOverride:kDefaultHostNameOverride
logContext:kDefaultLogContext logContext:kDefaultLogContext
@ -298,9 +298,9 @@ static NSUInteger kDefaultChannelId = 0;
connectInitialBackoff:_connectInitialBackoff connectInitialBackoff:_connectInitialBackoff
connectMaxBackoff:_connectMaxBackoff connectMaxBackoff:_connectMaxBackoff
additionalChannelArgs:[_additionalChannelArgs copy] additionalChannelArgs:[_additionalChannelArgs copy]
pemRootCert:_pemRootCert PEMRootCertificates:_PEMRootCertificates
pemPrivateKey:_pemPrivateKey PEMPrivateKey:_PEMPrivateKey
pemCertChain:_pemCertChain PEMCertChain:_PEMCertChain
transportType:_transportType transportType:_transportType
hostNameOverride:_hostNameOverride hostNameOverride:_hostNameOverride
logContext:_logContext logContext:_logContext
@ -326,9 +326,9 @@ static NSUInteger kDefaultChannelId = 0;
connectInitialBackoff:_connectInitialBackoff connectInitialBackoff:_connectInitialBackoff
connectMaxBackoff:_connectMaxBackoff connectMaxBackoff:_connectMaxBackoff
additionalChannelArgs:[_additionalChannelArgs copy] additionalChannelArgs:[_additionalChannelArgs copy]
pemRootCert:_pemRootCert PEMRootCertificates:_PEMRootCertificates
pemPrivateKey:_pemPrivateKey PEMPrivateKey:_PEMPrivateKey
pemCertChain:_pemCertChain PEMCertChain:_PEMCertChain
transportType:_transportType transportType:_transportType
hostNameOverride:_hostNameOverride hostNameOverride:_hostNameOverride
logContext:_logContext logContext:_logContext
@ -421,16 +421,16 @@ static NSUInteger kDefaultChannelId = 0;
_additionalChannelArgs = additionalChannelArgs; _additionalChannelArgs = additionalChannelArgs;
} }
- (void)setPemRootCert:(NSString *)pemRootCert { - (void)setPEMRootCertificates:(NSString *)PEMRootCertificates {
_pemRootCert = pemRootCert; _PEMRootCertificates = PEMRootCertificates;
} }
- (void)setPemPrivateKey:(NSString *)pemPrivateKey { - (void)setPEMPrivateKey:(NSString *)PEMPrivateKey {
_pemPrivateKey = pemPrivateKey; _PEMPrivateKey = PEMPrivateKey;
} }
- (void)setPemCertChain:(NSString *)pemCertChain { - (void)setPEMCertChain:(NSString *)PEMCertChain {
_pemCertChain = pemCertChain; _PEMCertChain = PEMCertChain;
} }
- (void)setTransportType:(GRPCTransportType)transportType { - (void)setTransportType:(GRPCTransportType)transportType {

24
src/objective-c/GRPCClient/private/GRPCChannelPool.m
Unescape View File

@ -54,9 +54,9 @@ const NSTimeInterval kChannelDestroyDelay = 30;
#ifdef GRPC_COMPILE_WITH_CRONET #ifdef GRPC_COMPILE_WITH_CRONET
if (![GRPCCall isUsingCronet]) { if (![GRPCCall isUsingCronet]) {
#endif #endif
factory = [GRPCSecureChannelFactory factoryWithPEMRootCerts:_callOptions.pemRootCert factory = [GRPCSecureChannelFactory factoryWithPEMRootCerts:_callOptions.PEMRootCertificates
privateKey:_callOptions.pemPrivateKey privateKey:_callOptions.PEMPrivateKey
certChain:_callOptions.pemCertChain certChain:_callOptions.PEMCertChain
error:&error]; error:&error];
if (error) { if (error) {
NSLog(@"Error creating secure channel factory: %@", error); NSLog(@"Error creating secure channel factory: %@", error);
@ -167,14 +167,14 @@ const NSTimeInterval kChannelDestroyDelay = 30;
[obj.callOptions.additionalChannelArgs [obj.callOptions.additionalChannelArgs
isEqualToDictionary:_callOptions.additionalChannelArgs])) isEqualToDictionary:_callOptions.additionalChannelArgs]))
return NO; return NO;
if (!(obj.callOptions.pemRootCert == _callOptions.pemRootCert || if (!(obj.callOptions.PEMRootCertificates == _callOptions.PEMRootCertificates ||
[obj.callOptions.pemRootCert isEqualToString:_callOptions.pemRootCert])) [obj.callOptions.PEMRootCertificates isEqualToString:_callOptions.PEMRootCertificates]))
return NO; return NO;
if (!(obj.callOptions.pemPrivateKey == _callOptions.pemPrivateKey || if (!(obj.callOptions.PEMPrivateKey == _callOptions.PEMPrivateKey ||
[obj.callOptions.pemPrivateKey isEqualToString:_callOptions.pemPrivateKey])) [obj.callOptions.PEMPrivateKey isEqualToString:_callOptions.PEMPrivateKey]))
return NO; return NO;
if (!(obj.callOptions.pemCertChain == _callOptions.pemCertChain || if (!(obj.callOptions.PEMCertChain == _callOptions.PEMCertChain ||
[obj.callOptions.pemCertChain isEqualToString:_callOptions.pemCertChain])) [obj.callOptions.PEMCertChain isEqualToString:_callOptions.PEMCertChain]))
return NO; return NO;
if (!(obj.callOptions.hostNameOverride == _callOptions.hostNameOverride || if (!(obj.callOptions.hostNameOverride == _callOptions.hostNameOverride ||
[obj.callOptions.hostNameOverride isEqualToString:_callOptions.hostNameOverride])) [obj.callOptions.hostNameOverride isEqualToString:_callOptions.hostNameOverride]))
@ -204,9 +204,9 @@ const NSTimeInterval kChannelDestroyDelay = 30;
result ^= (unsigned int)(_callOptions.connectInitialBackoff * 1000); result ^= (unsigned int)(_callOptions.connectInitialBackoff * 1000);
result ^= (unsigned int)(_callOptions.connectMaxBackoff * 1000); result ^= (unsigned int)(_callOptions.connectMaxBackoff * 1000);
result ^= _callOptions.additionalChannelArgs.hash; result ^= _callOptions.additionalChannelArgs.hash;
result ^= _callOptions.pemRootCert.hash; result ^= _callOptions.PEMRootCertificates.hash;
result ^= _callOptions.pemPrivateKey.hash; result ^= _callOptions.PEMPrivateKey.hash;
result ^= _callOptions.pemCertChain.hash; result ^= _callOptions.PEMCertChain.hash;
result ^= _callOptions.hostNameOverride.hash; result ^= _callOptions.hostNameOverride.hash;
result ^= _callOptions.transportType; result ^= _callOptions.transportType;
result ^= [_callOptions.logContext hash]; result ^= [_callOptions.logContext hash];

14
src/objective-c/GRPCClient/private/GRPCHost.m
Unescape View File

@ -38,8 +38,8 @@ NS_ASSUME_NONNULL_BEGIN
static NSMutableDictionary *kHostCache; static NSMutableDictionary *kHostCache;
@implementation GRPCHost { @implementation GRPCHost {
NSString *_pemRootCerts; NSString *_PEMRootCertificates;
NSString *_pemPrivateKey; NSString *_PEMPrivateKey;
NSString *_pemCertChain; NSString *_pemCertChain;
} }
@ -92,8 +92,8 @@ static NSMutableDictionary *kHostCache;
withPrivateKey:(nullable NSString *)pemPrivateKey withPrivateKey:(nullable NSString *)pemPrivateKey
withCertChain:(nullable NSString *)pemCertChain withCertChain:(nullable NSString *)pemCertChain
error:(NSError **)errorPtr { error:(NSError **)errorPtr {
_pemRootCerts = pemRootCerts; _PEMRootCertificates = pemRootCerts;
_pemPrivateKey = pemPrivateKey; _PEMPrivateKey = pemPrivateKey;
_pemCertChain = pemCertChain; _pemCertChain = pemCertChain;
return YES; return YES;
} }
@ -109,9 +109,9 @@ static NSMutableDictionary *kHostCache;
options.connectMinTimeout = (NSTimeInterval)_minConnectTimeout / 1000; options.connectMinTimeout = (NSTimeInterval)_minConnectTimeout / 1000;
options.connectInitialBackoff = (NSTimeInterval)_initialConnectBackoff / 1000; options.connectInitialBackoff = (NSTimeInterval)_initialConnectBackoff / 1000;
options.connectMaxBackoff = (NSTimeInterval)_maxConnectBackoff / 1000; options.connectMaxBackoff = (NSTimeInterval)_maxConnectBackoff / 1000;
options.pemRootCert = _pemRootCerts; options.PEMRootCertificates = _PEMRootCertificates;
options.pemPrivateKey = _pemPrivateKey; options.PEMPrivateKey = _PEMPrivateKey;
options.pemCertChain = _pemCertChain; options.PEMCertChain = _pemCertChain;
options.hostNameOverride = _hostNameOverride; options.hostNameOverride = _hostNameOverride;
options.transportType = _transportType; options.transportType = _transportType;
options.logContext = _logContext; options.logContext = _logContext;

2
src/objective-c/tests/InteropTests.h
Unescape View File

@ -51,7 +51,7 @@
* The root certificates to be used. The base implementation returns nil. Subclasses should override * The root certificates to be used. The base implementation returns nil. Subclasses should override
* to appropriate settings. * to appropriate settings.
*/ */
+ (NSString *)pemRootCert; + (NSString *)PEMRootCertificates;
/** /**
* The root certificates to be used. The base implementation returns nil. Subclasses should override * The root certificates to be used. The base implementation returns nil. Subclasses should override

8
src/objective-c/tests/InteropTests.m
Unescape View File

@ -147,7 +147,7 @@ BOOL isRemoteInteropTest(NSString *host) {
return GRPCTransportTypeChttp2BoringSSL; return GRPCTransportTypeChttp2BoringSSL;
} }
+ (NSString *)pemRootCert { + (NSString *)PEMRootCertificates {
return nil; return nil;
} }
@ -202,7 +202,7 @@ BOOL isRemoteInteropTest(NSString *host) {
GPBEmpty *request = [GPBEmpty message]; GPBEmpty *request = [GPBEmpty message];
GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init]; GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init];
options.transportType = self.class.transportType; options.transportType = self.class.transportType;
options.pemRootCert = self.class.pemRootCert; options.PEMRootCertificates = self.class.PEMRootCertificates;
options.hostNameOverride = self.class.hostNameOverride; options.hostNameOverride = self.class.hostNameOverride;
[_service [_service
@ -484,7 +484,7 @@ BOOL isRemoteInteropTest(NSString *host) {
requestedResponseSize:responses[index]]; requestedResponseSize:responses[index]];
GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init]; GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init];
options.transportType = self.class.transportType; options.transportType = self.class.transportType;
options.pemRootCert = self.class.pemRootCert; options.PEMRootCertificates = self.class.PEMRootCertificates;
options.hostNameOverride = self.class.hostNameOverride; options.hostNameOverride = self.class.hostNameOverride;
__block GRPCStreamingProtoCall *call = [_service __block GRPCStreamingProtoCall *call = [_service
@ -629,7 +629,7 @@ BOOL isRemoteInteropTest(NSString *host) {
GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init]; GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init];
options.transportType = self.class.transportType; options.transportType = self.class.transportType;
options.pemRootCert = self.class.pemRootCert; options.PEMRootCertificates = self.class.PEMRootCertificates;
options.hostNameOverride = self.class.hostNameOverride; options.hostNameOverride = self.class.hostNameOverride;
id request = id request =

2
src/objective-c/tests/InteropTestsLocalCleartext.m
Unescape View File

@ -41,7 +41,7 @@ static int32_t kLocalInteropServerOverhead = 10;
return kLocalCleartextHost; return kLocalCleartextHost;
} }
+ (NSString *)pemRootCert { + (NSString *)PEMRootCertificates {
return nil; return nil;
} }

2
src/objective-c/tests/InteropTestsLocalSSL.m
Unescape View File

@ -40,7 +40,7 @@ static int32_t kLocalInteropServerOverhead = 10;
return kLocalSSLHost; return kLocalSSLHost;
} }
+ (NSString *)pemRootCert { + (NSString *)PEMRootCertificates {
NSBundle *bundle = [NSBundle bundleForClass:self.class]; NSBundle *bundle = [NSBundle bundleForClass:self.class];
NSString *certsPath = NSString *certsPath =
[bundle pathForResource:@"TestCertificates.bundle/test-certificates" ofType:@"pem"]; [bundle pathForResource:@"TestCertificates.bundle/test-certificates" ofType:@"pem"];

2
src/objective-c/tests/InteropTestsMultipleChannels/InteropTestsMultipleChannels.m
Unescape View File

@ -115,7 +115,7 @@ dispatch_once_t initCronet;
options = [[GRPCCallOptions alloc] init]; options = [[GRPCCallOptions alloc] init];
options.transportType = GRPCTransportTypeChttp2BoringSSL; options.transportType = GRPCTransportTypeChttp2BoringSSL;
options.pemRootCert = certs; options.PEMRootCertificates = certs;
options.hostNameOverride = @"foo.test.google.fr"; options.hostNameOverride = @"foo.test.google.fr";
_localSSLService.options = options; _localSSLService.options = options;
} }

2
src/objective-c/tests/InteropTestsRemote.m
Unescape View File

@ -41,7 +41,7 @@ static int32_t kRemoteInteropServerOverhead = 12;
return kRemoteSSLHost; return kRemoteSSLHost;
} }
+ (NSString *)pemRootCert { + (NSString *)PEMRootCertificates {
return nil; return nil;
} }

Write Preview
Loading…
Cancel
Save