diff options
Diffstat (limited to 'cpp/src/IceSSL/SChannelEngine.cpp')
| -rw-r--r-- | cpp/src/IceSSL/SChannelEngine.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp index 9383c77466e..37bd41b2ff0 100644 --- a/cpp/src/IceSSL/SChannelEngine.cpp +++ b/cpp/src/IceSSL/SChannelEngine.cpp @@ -13,10 +13,11 @@ #include <Ice/LocalException.h> #include <Ice/Logger.h> #include <Ice/Communicator.h> +#include <Ice/StringConverter.h> #include <IceUtil/StringUtil.h> #include <IceUtil/FileUtil.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> using namespace std; using namespace Ice; @@ -395,7 +396,7 @@ SChannelEngine::initialize() do { string s = password(false); - store = PFXImportCertStore(&pfxBlob, stringToWstring(s).c_str(), importFlags); + store = PFXImportCertStore(&pfxBlob, Ice::stringToWstring(s).c_str(), importFlags); err = store ? 0 : GetLastError(); } while(err == ERROR_INVALID_PASSWORD && passwordPrompt && ++count < passwordRetryMax); @@ -537,7 +538,7 @@ SChannelEngine::initialize() // // Create a new RSA key set to store our key // - const wstring keySetName = stringToWstring(generateUUID()); + const wstring keySetName = Ice::stringToWstring(generateUUID()); HCRYPTPROV cryptProv = 0; DWORD contextFlags = CRYPT_NEWKEYSET; |