Fixed (ICE-7621) - Refactor IceSSL API to support multiple implementations

1 files changed, 25 insertions, 90 deletions

diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h
index c1bf6138819..ac9697a990e 100644
--- a/cpp/src/IceSSL/Util.h
+++ b/cpp/src/IceSSL/Util.h
@@ -13,29 +13,38 @@
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
-
-#include <Ice/UniqueRef.h>
-
 #include <IceSSL/Plugin.h>
 
-#if defined(ICE_USE_OPENSSL)
-#  include <openssl/ssl.h>
-#  include <list>
-#elif defined(ICE_USE_SECURE_TRANSPORT)
-#  include <Security/Security.h>
+#if defined(__APPLE__)
 #  include <CoreFoundation/CoreFoundation.h>
-#elif defined(ICE_USE_SCHANNEL)
-#  include <wincrypt.h>
+#  if TARGET_OS_IPHONE != 0
+#    define ICE_USE_SECURE_TRANSPORT_IOS 1
+#  else
+#    define ICE_USE_SECURE_TRANSPORT_MACOS 1
+#  endif
 #endif
 
 namespace IceSSL
 {
 
+#if defined(__APPLE__)
+//
+// Helper functions to use by Secure Transport.
+//
+std::string fromCFString(CFStringRef);
+
+inline CFStringRef
+toCFString(const std::string& s)
+{
+    return CFStringCreateWithCString(ICE_NULLPTR, s.c_str(), kCFStringEncodingUTF8);
+}
+#endif
+
 #ifdef ICE_CPP11_MAPPING
 //
 // Adapts the C++11 functions to C++98-like callbacks
 //
-class CertificateVerifier
+class ICESSL_API CertificateVerifier
 {
 public:
 
@@ -48,7 +57,7 @@ private:
 };
 using CertificateVerifierPtr = std::shared_ptr<CertificateVerifier>;
 
-class PasswordPrompt
+class ICESSL_API PasswordPrompt
 {
 public:
 
@@ -77,92 +86,18 @@ const int AltNameURL = 6;
 const int AltNAmeIP = 7;
 //const AltNameObjectIdentifier = 8;
 
-#ifdef ICE_USE_OPENSSL
-
-#  ifndef OPENSSL_NO_DH
-class DHParams : public IceUtil::Shared, public IceUtil::Mutex
-{
-public:
-
-    DHParams();
-    ~DHParams();
-
-    bool add(int, const std::string&);
-    DH* get(int);
-
-private:
-
-    typedef std::pair<int, DH*> KeyParamPair;
-    typedef std::list<KeyParamPair> ParamList;
-    ParamList _params;
-
-    DH* _dh512;
-    DH* _dh1024;
-    DH* _dh2048;
-    DH* _dh4096;
-};
-typedef IceUtil::Handle<DHParams> DHParamsPtr;
-#  endif
-
-//
-// Accumulate the OpenSSL error stack into a string.
-//
-std::string getSslErrors(bool);
-
-#elif defined(ICE_USE_SECURE_TRANSPORT)
-//
-// Helper functions to use by Secure Transport.
-//
-
-std::string fromCFString(CFStringRef);
-
-inline CFStringRef
-toCFString(const std::string& s)
-{
-    return CFStringCreateWithCString(ICE_NULLPTR, s.c_str(), kCFStringEncodingUTF8);
-}
-
-std::string errorToString(CFErrorRef);
-std::string errorToString(OSStatus);
-
-#  if defined(ICE_USE_SECURE_TRANSPORT_MACOS)
-//
-// Retrieve a certificate property
-//
-CFDictionaryRef getCertificateProperty(SecCertificateRef, CFTypeRef);
-#  endif
-
-//
-// Read certificate from a file.
-//
-CFArrayRef loadCertificateChain(const std::string&, const std::string&, const std::string&, const std::string&,
-                                const std::string&, const PasswordPromptPtr&, int);
-
-SecCertificateRef loadCertificate(const std::string&);
-CFArrayRef loadCACertificates(const std::string&);
-CFArrayRef findCertificateChain(const std::string&, const std::string&, const std::string&);
-
-#elif defined(ICE_USE_SCHANNEL)
-std::vector<PCCERT_CONTEXT>
-findCertificates(const std::string&, const std::string&, const std::string&, std::vector<HCERTSTORE>&);
-#elif defined(ICE_OS_UWP)
-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
-
 //
 // Read a file into memory buffer.
 //
-void readFile(const std::string&, std::vector<char>&);
+ICESSL_API void readFile(const std::string&, std::vector<char>&);
 
 //
 // Determine if a file or directory exists, with an optional default
 // directory.
 //
-bool checkPath(const std::string&, const std::string&, bool, std::string&);
+ICESSL_API bool checkPath(const std::string&, const std::string&, bool, std::string&);
+
+ICESSL_API bool parseBytes(const std::string&, std::vector<unsigned char>&);
 
 }