diff options
| author | Jose <jose@zeroc.com> | 2016-11-24 21:31:26 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-11-24 21:31:26 +0100 |
| commit | 64a9231b01a869bccd3585abeb9eec75d9697bcf (patch) | |
| tree | 00b9d15949c5159dce8821339e458215570ff22a /cpp/src/IceSSL/Util.h | |
| parent | Port IceSSL/configuration test to UWP and fixes to UWP IceSSL implementation (diff) | |
| download | ice-64a9231b01a869bccd3585abeb9eec75d9697bcf.tar.bz2 ice-64a9231b01a869bccd3585abeb9eec75d9697bcf.tar.xz ice-64a9231b01a869bccd3585abeb9eec75d9697bcf.zip | |
UWP IceSSL implementation improvements
- Add support for IceSSL.CertFile
- Add support for IceSSL password prompt
Diffstat (limited to 'cpp/src/IceSSL/Util.h')
| -rw-r--r-- | cpp/src/IceSSL/Util.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h index 59ff813a1a8..f10f5f25a72 100644 --- a/cpp/src/IceSSL/Util.h +++ b/cpp/src/IceSSL/Util.h @@ -181,12 +181,12 @@ toCFString(const std::string& s) std::string errorToString(CFErrorRef); std::string errorToString(OSStatus); -#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0 +# if defined(ICE_USE_SECURE_TRANSPORT_MACOS) // // Retrieve a certificate property // CFDictionaryRef getCertificateProperty(SecCertificateRef, CFTypeRef); -#endif +# endif // // Read certificate from a file. @@ -203,6 +203,9 @@ CFArrayRef findCertificateChain(const std::string&, const std::string&, const st std::vector<PCCERT_CONTEXT> findCertificates(const std::string&, const std::string&, const std::string&, std::vector<HCERTSTORE>&); #elif defined(ICE_OS_WINRT) +Windows::Security::Cryptography::Certificates::Certificate^ +importPersonalCertificate(const std::string&, std::function<std::string()>, bool, int); + Windows::Foundation::Collections::IVectorView<Windows::Security::Cryptography::Certificates::Certificate^>^ findCertificates(const std::string&, const std::string&); #endif |