diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-04-07 19:24:08 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-04-07 19:24:08 +0200 |
| commit | 92b20f89662b327edf8f732d082d9fd07da9c665 (patch) | |
| tree | 1224af8f2d610322a2ab6520471c503af0e20fe0 /objective-c/test | |
| parent | Fixed IceSSL OpenSSL bug which could cause a crash when loading a certificate... (diff) | |
| download | ice-92b20f89662b327edf8f732d082d9fd07da9c665.tar.bz2 ice-92b20f89662b327edf8f732d082d9fd07da9c665.tar.xz ice-92b20f89662b327edf8f732d082d9fd07da9c665.zip | |
ICE-6382: removed iceca and fixed makecerts.py to depend on IceCertUtils PyPI package
Diffstat (limited to 'objective-c/test')
| -rw-r--r-- | objective-c/test/Common/TestCommon.m | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/objective-c/test/Common/TestCommon.m b/objective-c/test/Common/TestCommon.m index fad9e6da5e3..658f3962865 100644 --- a/objective-c/test/Common/TestCommon.m +++ b/objective-c/test/Common/TestCommon.m @@ -70,7 +70,7 @@ defaultServerProperties(int *argc, char** argv) @"Ice.Override.ConnectTimeout", @"10000", // COMPILERFIX: Workaround for SSL hang on iOS devices @"IceSSL.CertAuthFile", @"cacert.der", @"IceSSL.CheckCertName", @"0", - @"IceSSL.CertFile", @"s_rsa1024.pfx", + @"IceSSL.CertFile", @"server.p12", @"IceSSL.Password", @"password" }; @@ -87,7 +87,7 @@ defaultServerProperties(int *argc, char** argv) [properties setProperty:ssldefaults[i] value:ssldefaults[i+1]]; } } - + if(sliced) { [properties setProperty:@"Ice.Default.SlicedFormat" value:@"1"]; @@ -124,7 +124,7 @@ defaultClientProperties(int* argc, char** argv) @"Ice.Override.ConnectTimeout", @"10000", // COMPILERFIX: Workaround for SSL hang on iOS devices @"IceSSL.CheckCertName", @"0", @"IceSSL.CertAuthFile", @"cacert.der", - @"IceSSL.CertFile", @"c_rsa1024.pfx", + @"IceSSL.CertFile", @"client.p12", @"IceSSL.Password", @"password" }; @@ -195,7 +195,7 @@ tprintf(const char* fmt, ...) { va_list va; va_start(va, fmt); - NSString* s = ICE_AUTORELEASE([[NSString alloc] initWithFormat:[NSString stringWithCString:fmt + NSString* s = ICE_AUTORELEASE([[NSString alloc] initWithFormat:[NSString stringWithCString:fmt encoding:NSUTF8StringEncoding] arguments:va]); va_end(va); @@ -219,7 +219,7 @@ tprintf(const char* fmt, ...) { va_list va; va_start(va, fmt); - NSString* s = ICE_AUTORELEASE([[NSString alloc] initWithFormat:[NSString stringWithCString:fmt + NSString* s = ICE_AUTORELEASE([[NSString alloc] initWithFormat:[NSString stringWithCString:fmt encoding:NSUTF8StringEncoding] arguments:va]); va_end(va); |