summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/Util.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-07-08 10:50:18 -0400
committerBernard Normier <bernard@zeroc.com>2016-07-08 10:50:18 -0400
commit3e6c7c189ba3d623845dfc385f143cc49e4be8aa (patch)
tree5e0dfa828891d67c230736a6cf4f5adeb2216097 /cpp/src/IceSSL/Util.cpp
parentAdditional UWP fix for ICE-7172 (diff)
downloadice-3e6c7c189ba3d623845dfc385f143cc49e4be8aa.tar.bz2
ice-3e6c7c189ba3d623845dfc385f143cc49e4be8aa.tar.xz
ice-3e6c7c189ba3d623845dfc385f143cc49e4be8aa.zip
Removed IceUtilInternal ifstream and ofstream
Diffstat (limited to 'cpp/src/IceSSL/Util.cpp')
-rwxr-xr-xcpp/src/IceSSL/Util.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp
index ced265c943e..2bd931be770 100755
--- a/cpp/src/IceSSL/Util.cpp
+++ b/cpp/src/IceSSL/Util.cpp
@@ -20,6 +20,7 @@
#include <Ice/LocalException.h>
#include <Ice/Network.h>
#include <Ice/Object.h>
+#include <fstream>
#ifdef ICE_USE_OPENSSL
# include <openssl/err.h>
@@ -206,7 +207,7 @@ unsigned char dh4096_g[] = { 0x02 };
//
// With OpenSSL 1.1.0 is no longer possible to acess the DH p and g
// data members to set the DH params. We still use the same default
-// parameters but they were converted to DER format using
+// parameters but they were converted to DER format using
// i2d_DHparams and can be restored using d2i_DHparams
unsigned char dh512[] =
@@ -611,7 +612,7 @@ namespace
CFDataRef
readCertFile(const string& file)
{
- IceUtilInternal::ifstream is(file, ios::in | ios::binary);
+ ifstream is(IceUtilInternal::streamFilename(file), ios::in | ios::binary);
if(!is.good())
{
throw CertificateReadException(__FILE__, __LINE__, "error opening file " + file);
@@ -1654,7 +1655,7 @@ IceSSL::findCertificates(const string& location, const string& name, const strin
void
IceSSL::readFile(const string& file, vector<char>& buffer)
{
- IceUtilInternal::ifstream is(file, ios::in | ios::binary);
+ ifstream is(IceUtilInternal::streamFilename(file), ios::in | ios::binary);
if(!is.good())
{
throw CertificateReadException(__FILE__, __LINE__, "error opening file " + file);