diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-08-01 10:09:48 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-08-01 10:09:48 -0400 |
| commit | 4aa7ae5129a9cb66f5ea26165310e96603af576c (patch) | |
| tree | f8ee6859ad547b59cc28eadb1212f403f51dfff7 /cpp/src/IceSSL/SChannelEngine.cpp | |
| parent | Do not initialize OpenSSL locks if already done by other library. (diff) | |
| download | ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.bz2 ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.xz ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.zip | |
Move StringConverter API to namespace Ice
Diffstat (limited to 'cpp/src/IceSSL/SChannelEngine.cpp')
| -rw-r--r-- | cpp/src/IceSSL/SChannelEngine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp index c8b2885909a..de509399d0b 100644 --- a/cpp/src/IceSSL/SChannelEngine.cpp +++ b/cpp/src/IceSSL/SChannelEngine.cpp @@ -395,7 +395,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 +537,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; |