diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-10-27 10:37:40 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-10-27 10:37:40 +0200 |
| commit | 9e27de87d9ab37006ff2b9a45128f08d83ab4ba6 (patch) | |
| tree | 75d464f2dc7fab4a653a18a6059402f6de41e370 /cpp/src/IceSSL/SecureTransportUtil.cpp | |
| parent | Whitespace cleanup (diff) | |
| download | ice-9e27de87d9ab37006ff2b9a45128f08d83ab4ba6.tar.bz2 ice-9e27de87d9ab37006ff2b9a45128f08d83ab4ba6.tar.xz ice-9e27de87d9ab37006ff2b9a45128f08d83ab4ba6.zip | |
Fixed iOS and PHP7 shadow warning related build failures
Diffstat (limited to 'cpp/src/IceSSL/SecureTransportUtil.cpp')
| -rw-r--r-- | cpp/src/IceSSL/SecureTransportUtil.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/cpp/src/IceSSL/SecureTransportUtil.cpp b/cpp/src/IceSSL/SecureTransportUtil.cpp index a9c7b1a68ae..54a036bf8d3 100644 --- a/cpp/src/IceSSL/SecureTransportUtil.cpp +++ b/cpp/src/IceSSL/SecureTransportUtil.cpp @@ -524,9 +524,15 @@ loadCerts(const string& file) // CFArrayRef IceSSL::SecureTransport::loadCertificateChain(const string& file, +#if defined(ICE_USE_SECURE_TRANSPORT_IOS) + const string& /*keyFile*/, + const std::string& /*keychainPath*/, + const string& /*keychainPassword*/, +#else const string& keyFile, const std::string& keychainPath, const string& keychainPassword, +#endif const string& password, const PasswordPromptPtr& prompt, int retryMax) @@ -652,9 +658,15 @@ IceSSL::SecureTransport::loadCACertificates(const string& file) } CFArrayRef +#if defined(ICE_USE_SECURE_TRANSPORT_IOS) +IceSSL::SecureTransport::findCertificateChain(const std::string&, + const std::string&, + const string& value) +#else IceSSL::SecureTransport::findCertificateChain(const std::string& keychainPath, const std::string& keychainPassword, const string& value) +#endif { // // Search the keychain using key:value pairs. The following keys are supported: |