summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-12-14 22:51:50 +0100
committerJose <jose@zeroc.com>2016-12-14 22:51:50 +0100
commit64bc7eef5fc343c33acd6264ed26330de7d2e3a5 (patch)
tree17550e0b2e3d9356b6c934154fb57e174503f146 /cpp/src/IceSSL
parentWindows test script fixes (diff)
downloadice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.tar.bz2
ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.tar.xz
ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.zip
WinRT -> UWP renames
Diffstat (limited to 'cpp/src/IceSSL')
-rw-r--r--cpp/src/IceSSL/AcceptorI.cpp6
-rw-r--r--cpp/src/IceSSL/AcceptorI.h4
-rwxr-xr-xcpp/src/IceSSL/Certificate.cpp34
-rw-r--r--cpp/src/IceSSL/ConnectorI.cpp2
-rwxr-xr-xcpp/src/IceSSL/PluginI.cpp4
-rw-r--r--cpp/src/IceSSL/PluginI.h4
-rw-r--r--cpp/src/IceSSL/SSLEngine.h8
-rw-r--r--cpp/src/IceSSL/SSLEngineF.h8
-rw-r--r--[-rwxr-xr-x]cpp/src/IceSSL/UWPEngine.cpp (renamed from cpp/src/IceSSL/WinRTEngine.cpp)16
-rw-r--r--[-rwxr-xr-x]cpp/src/IceSSL/UWPTransceiverI.cpp (renamed from cpp/src/IceSSL/WinRTTransceiverI.cpp)6
-rw-r--r--[-rwxr-xr-x]cpp/src/IceSSL/UWPTransceiverI.h (renamed from cpp/src/IceSSL/WinRTTransceiverI.h)8
-rwxr-xr-xcpp/src/IceSSL/Util.cpp8
-rw-r--r--cpp/src/IceSSL/Util.h2
-rw-r--r--cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj4
-rw-r--r--cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj.filters4
15 files changed, 59 insertions, 59 deletions
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp
index 8042fb8d195..ee8a05c4725 100644
--- a/cpp/src/IceSSL/AcceptorI.cpp
+++ b/cpp/src/IceSSL/AcceptorI.cpp
@@ -15,7 +15,7 @@
#include <IceSSL/OpenSSLTransceiverI.h>
#include <IceSSL/SecureTransportTransceiverI.h>
#include <IceSSL/SChannelTransceiverI.h>
-#include <IceSSL/WinRTTransceiverI.h>
+#include <IceSSL/UWPTransceiverI.h>
#include <IceSSL/Util.h>
@@ -34,7 +34,7 @@ IceSSL::AcceptorI::getNativeInfo()
}
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
IceInternal::AsyncInfo*
IceSSL::AcceptorI::getAsyncInfo(IceInternal::SocketOperation status)
{
@@ -55,7 +55,7 @@ IceSSL::AcceptorI::listen()
return _endpoint;
}
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
void
IceSSL::AcceptorI::startAccept()
{
diff --git a/cpp/src/IceSSL/AcceptorI.h b/cpp/src/IceSSL/AcceptorI.h
index 3ee5d5d2d4c..b71ef8ee46c 100644
--- a/cpp/src/IceSSL/AcceptorI.h
+++ b/cpp/src/IceSSL/AcceptorI.h
@@ -25,13 +25,13 @@ class AcceptorI : public IceInternal::Acceptor, public IceInternal::NativeInfo
public:
virtual IceInternal::NativeInfoPtr getNativeInfo();
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
virtual IceInternal::AsyncInfo* getAsyncInfo(IceInternal::SocketOperation);
#endif
virtual void close();
virtual IceInternal::EndpointIPtr listen();
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
virtual void startAccept();
virtual void finishAccept();
#endif
diff --git a/cpp/src/IceSSL/Certificate.cpp b/cpp/src/IceSSL/Certificate.cpp
index c0f7cb42589..97f2bd63365 100755
--- a/cpp/src/IceSSL/Certificate.cpp
+++ b/cpp/src/IceSSL/Certificate.cpp
@@ -28,7 +28,7 @@
# pragma GCC diagnostic ignored "-Wold-style-cast"
#elif defined(ICE_USE_SECURE_TRANSPORT)
# include <Security/Security.h>
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
# include <ppltasks.h>
# include <nserror.h>
#endif
@@ -52,7 +52,7 @@ using namespace std;
using namespace Ice;
using namespace IceSSL;
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
using namespace concurrency;
using namespace Platform;
using namespace Windows::Foundation;
@@ -429,7 +429,7 @@ private:
};
#endif
-#elif defined(ICE_USE_SCHANNEL) || defined(ICE_OS_WINRT)
+#elif defined(ICE_USE_SCHANNEL) || defined(ICE_OS_UWP)
const Ice::Long TICKS_PER_MSECOND = 10000LL;
const Ice::Long MSECS_TO_EPOCH = 11644473600000LL;
@@ -1137,7 +1137,7 @@ Certificate::load(const string& file)
}
BIO_free(cert);
return ICE_MAKE_SHARED(Certificate, x);
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
promise<shared_ptr<Certificate>> result;
create_task(StorageFile::GetFileFromApplicationUriAsync(
ref new Uri(ref new String(stringToWstring(file).c_str())))).then([](StorageFile^ file)
@@ -1241,7 +1241,7 @@ Certificate::decode(const string& encoding)
}
BIO_free(cert);
return ICE_MAKE_SHARED(Certificate, x);
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
string::size_type size, startpos, endpos = 0;
startpos = encoding.find("-----BEGIN CERTIFICATE-----", endpos);
if (startpos != string::npos)
@@ -1275,7 +1275,7 @@ Certificate::operator==(const Certificate& other) const
return CertCompareCertificate(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, _certInfo, other._certInfo);
#elif defined(ICE_USE_OPENSSL)
return X509_cmp(_cert, other._cert) == 0;
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
return CryptographicBuffer::Compare(_cert->GetCertificateBlob(), other._cert->GetCertificateBlob());
#else
# error "Unknown platform"
@@ -1305,7 +1305,7 @@ Certificate::getPublicKey() const
return ICE_MAKE_SHARED(PublicKey, ICE_SHARED_FROM_CONST_THIS(Certificate), &_certInfo->SubjectPublicKeyInfo);
#elif defined(ICE_USE_OPENSSL)
return ICE_MAKE_SHARED(PublicKey, ICE_SHARED_FROM_CONST_THIS(Certificate), X509_get_pubkey(_cert));
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
return ICE_NULLPTR; // Not supported
#else
# error "Unknown platform"
@@ -1433,7 +1433,7 @@ Certificate::verify(const CertificatePtr& cert) const
return result;
#elif defined(ICE_USE_OPENSSL)
return X509_verify(_cert, cert->getPublicKey()->key()) > 0;
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
return false;
#else
# error "Unknown platform"
@@ -1519,7 +1519,7 @@ Certificate::encode() const
string result = string(p->data, p->length);
BIO_free(out);
return result;
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
auto reader = Windows::Storage::Streams::DataReader::FromBuffer(_cert->GetCertificateBlob());
std::vector<unsigned char> data(reader->UnconsumedBufferLength);
if(!data.empty())
@@ -1572,7 +1572,7 @@ Certificate::getNotAfter() const
return filetimeToTime(_certInfo->NotAfter);
#elif defined(ICE_USE_OPENSSL)
return ASMUtcTimeToTime(X509_get_notAfter(_cert));
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
// Convert 100ns time from January 1, 1601 to ms from January 1, 1970
IceUtil::Time time = IceUtil::Time::milliSeconds(_cert->ValidTo.UniversalTime / TICKS_PER_MSECOND - MSECS_TO_EPOCH);
# ifdef ICE_CPP11_MAPPING
@@ -1599,7 +1599,7 @@ Certificate::getNotBefore() const
return filetimeToTime(_certInfo->NotBefore);
#elif defined(ICE_USE_OPENSSL)
return ASMUtcTimeToTime(X509_get_notBefore(_cert));
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
// Convert 100ns time from January 1, 1601 to ms from January 1, 1970
IceUtil::Time time = IceUtil::Time::milliSeconds(_cert->ValidFrom.UniversalTime / TICKS_PER_MSECOND - MSECS_TO_EPOCH);
# ifdef ICE_CPP11_MAPPING
@@ -1645,7 +1645,7 @@ Certificate::getSerialNumber() const
BN_free(bn);
return result;
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
ostringstream os;
os.fill(0);
os.width(2);
@@ -1671,7 +1671,7 @@ Certificate::getIssuerDN() const
return DistinguishedName(certNameToString(&_certInfo->Issuer));
#elif defined(ICE_USE_OPENSSL)
return DistinguishedName(RFC2253::parseStrict(convertX509NameToString(X509_get_issuer_name(_cert))));
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
ostringstream os;
os << "CN=" << wstringToString(_cert->Issuer->Data());
return DistinguishedName(os.str());
@@ -1690,7 +1690,7 @@ Certificate::getIssuerAlternativeNames()
return certificateAltNames(_certInfo, szOID_ISSUER_ALT_NAME2);
#elif defined(ICE_USE_OPENSSL)
return convertGeneralNames(reinterpret_cast<GENERAL_NAMES*>(X509_get_ext_d2i(_cert, NID_issuer_alt_name, 0, 0)));
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
return vector<pair<int, string> >(); // Not supported
#else
# error "Unknown platform"
@@ -1719,7 +1719,7 @@ Certificate::getSubjectDN() const
return DistinguishedName(certNameToString(&_certInfo->Subject));
#elif defined(ICE_USE_OPENSSL)
return DistinguishedName(RFC2253::parseStrict(convertX509NameToString(X509_get_subject_name(_cert))));
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
ostringstream os;
os << "CN=" << wstringToString(_cert->Subject->Data());
return DistinguishedName(os.str());
@@ -1738,7 +1738,7 @@ Certificate::getSubjectAlternativeNames()
return certificateAltNames(_certInfo, szOID_SUBJECT_ALT_NAME2);
#elif defined(ICE_USE_OPENSSL)
return convertGeneralNames(reinterpret_cast<GENERAL_NAMES*>(X509_get_ext_d2i(_cert, NID_subject_alt_name, 0, 0)));
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
return certificateAltNames(_cert->SubjectAlternativeName);
#else
# error "Unknown platform"
@@ -1758,7 +1758,7 @@ Certificate::getVersion() const
return _certInfo->dwVersion;
#elif defined(ICE_USE_OPENSSL)
return static_cast<int>(X509_get_version(_cert));
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
return -1; // Not supported
#else
# error "Unknown platform"
diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp
index 1d2ee15efd2..67f6f082e1c 100644
--- a/cpp/src/IceSSL/ConnectorI.cpp
+++ b/cpp/src/IceSSL/ConnectorI.cpp
@@ -13,7 +13,7 @@
#include <IceSSL/OpenSSLTransceiverI.h>
#include <IceSSL/SecureTransportTransceiverI.h>
#include <IceSSL/SChannelTransceiverI.h>
-#include <IceSSL/WinRTTransceiverI.h>
+#include <IceSSL/UWPTransceiverI.h>
#include <IceSSL/EndpointI.h>
#include <IceSSL/Util.h>
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index b556be171c0..f4caa30fba0 100755
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -82,8 +82,8 @@ IceSSL::PluginI::PluginI(const Ice::CommunicatorPtr& com)
_engine = new SecureTransportEngine(com);
#elif defined(ICE_USE_SCHANNEL)
_engine = new SChannelEngine(com);
-#elif defined(ICE_OS_WINRT)
- _engine = new WinRTEngine(com);
+#elif defined(ICE_OS_UWP)
+ _engine = new UWPEngine(com);
#else
_engine = new OpenSSLEngine(com);
#endif
diff --git a/cpp/src/IceSSL/PluginI.h b/cpp/src/IceSSL/PluginI.h
index b0f61028c21..e896f52cc5a 100644
--- a/cpp/src/IceSSL/PluginI.h
+++ b/cpp/src/IceSSL/PluginI.h
@@ -51,8 +51,8 @@ private:
SecureTransportEnginePtr _engine;
#elif defined(ICE_USE_SCHANNEL)
SChannelEnginePtr _engine;
-#elif defined(ICE_OS_WINRT)
- WinRTEnginePtr _engine;
+#elif defined(ICE_OS_UWP)
+ UWPEnginePtr _engine;
#else
OpenSSLEnginePtr _engine;
#endif
diff --git a/cpp/src/IceSSL/SSLEngine.h b/cpp/src/IceSSL/SSLEngine.h
index 1ceca9e7b16..d9f1a87ca81 100644
--- a/cpp/src/IceSSL/SSLEngine.h
+++ b/cpp/src/IceSSL/SSLEngine.h
@@ -40,7 +40,7 @@
# include <sspi.h>
# include <schannel.h>
# undef SECURITY_WIN32
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
# include <mutex>
#endif
@@ -225,13 +225,13 @@ private:
std::vector<ALG_ID> _ciphers;
};
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
-class WinRTEngine : public SSLEngine
+class UWPEngine : public SSLEngine
{
public:
- WinRTEngine(const Ice::CommunicatorPtr&);
+ UWPEngine(const Ice::CommunicatorPtr&);
virtual void initialize();
virtual bool initialized() const;
diff --git a/cpp/src/IceSSL/SSLEngineF.h b/cpp/src/IceSSL/SSLEngineF.h
index 1a5548aaf2b..70a75e74edb 100644
--- a/cpp/src/IceSSL/SSLEngineF.h
+++ b/cpp/src/IceSSL/SSLEngineF.h
@@ -30,10 +30,10 @@ typedef IceInternal::Handle<SecureTransportEngine> SecureTransportEnginePtr;
class SChannelEngine;
ICESSL_API IceUtil::Shared* upCast(SChannelEngine*);
typedef IceInternal::Handle<SChannelEngine> SChannelEnginePtr;
-#elif defined(ICE_OS_WINRT)
-class WinRTEngine;
-ICESSL_API IceUtil::Shared* upCast(WinRTEngine*);
-typedef IceInternal::Handle<WinRTEngine> WinRTEnginePtr;
+#elif defined(ICE_OS_UWP)
+class UWPEngine;
+ICESSL_API IceUtil::Shared* upCast(UWPEngine*);
+typedef IceInternal::Handle<UWPEngine> UWPEnginePtr;
#else // OpenSSL
class OpenSSLEngine;
ICESSL_API IceUtil::Shared* upCast(OpenSSLEngine*);
diff --git a/cpp/src/IceSSL/WinRTEngine.cpp b/cpp/src/IceSSL/UWPEngine.cpp
index 51cde970937..1619fa68f21 100755..100644
--- a/cpp/src/IceSSL/WinRTEngine.cpp
+++ b/cpp/src/IceSSL/UWPEngine.cpp
@@ -9,7 +9,7 @@
#include <IceSSL/Config.h>
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
#include <IceSSL/SSLEngine.h>
#include <Ice/Communicator.h>
@@ -18,17 +18,17 @@
#include <string>
-IceUtil::Shared* IceSSL::upCast(IceSSL::WinRTEngine* p) { return p; }
+IceUtil::Shared* IceSSL::upCast(IceSSL::UWPEngine* p) { return p; }
using namespace std;
using namespace IceSSL;
-WinRTEngine::WinRTEngine(const Ice::CommunicatorPtr& communicator) : SSLEngine(communicator)
+UWPEngine::UWPEngine(const Ice::CommunicatorPtr& communicator) : SSLEngine(communicator)
{
}
void
-WinRTEngine::initialize()
+UWPEngine::initialize()
{
lock_guard<mutex> lock(_mutex);
if(_initialized)
@@ -81,25 +81,25 @@ WinRTEngine::initialize()
}
bool
-WinRTEngine::initialized() const
+UWPEngine::initialized() const
{
return _initialized;
}
//shared_ptr<Certificate>
-//WinRTEngine::ca()
+//UWPEngine::ca()
//{
// return _ca;
//}
shared_ptr<Certificate>
-WinRTEngine::certificate()
+UWPEngine::certificate()
{
return _certificate;
}
void
-WinRTEngine::destroy()
+UWPEngine::destroy()
{
}
diff --git a/cpp/src/IceSSL/WinRTTransceiverI.cpp b/cpp/src/IceSSL/UWPTransceiverI.cpp
index 2e974c1725d..bef7d0769b5 100755..100644
--- a/cpp/src/IceSSL/WinRTTransceiverI.cpp
+++ b/cpp/src/IceSSL/UWPTransceiverI.cpp
@@ -9,9 +9,9 @@
#include <IceSSL/Config.h>
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
-#include <IceSSL/WinRTTransceiverI.h>
+#include <IceSSL/UWPTransceiverI.h>
#include <IceSSL/Instance.h>
#include <IceSSL/SSLEngine.h>
#include <Ice/Logger.h>
@@ -370,7 +370,7 @@ IceSSL::TransceiverI::TransceiverI(const InstancePtr& instance,
const string& hostOrAdapterName,
bool incoming) :
_instance(instance),
- _engine(WinRTEnginePtr::dynamicCast(instance->engine())),
+ _engine(UWPEnginePtr::dynamicCast(instance->engine())),
_host(incoming ? "" : hostOrAdapterName),
_adapterName(incoming ? hostOrAdapterName : ""),
_incoming(incoming),
diff --git a/cpp/src/IceSSL/WinRTTransceiverI.h b/cpp/src/IceSSL/UWPTransceiverI.h
index 71429198022..6f1e7ef41fc 100755..100644
--- a/cpp/src/IceSSL/WinRTTransceiverI.h
+++ b/cpp/src/IceSSL/UWPTransceiverI.h
@@ -7,12 +7,12 @@
//
// **********************************************************************
-#ifndef ICE_SSL_WINRT_TRANSCEIVER_I_H
-#define ICE_SSL_WINRT_TRANSCEIVER_I_H
+#ifndef ICE_SSL_UWP_TRANSCEIVER_I_H
+#define ICE_SSL_UWP_TRANSCEIVER_I_H
#include <IceSSL/Config.h>
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
#include <IceSSL/InstanceF.h>
#include <IceSSL/SSLEngineF.h>
@@ -59,7 +59,7 @@ private:
friend class AcceptorI;
const InstancePtr _instance;
- const WinRTEnginePtr _engine;
+ const UWPEnginePtr _engine;
const std::string _host;
const std::string _adapterName;
const bool _incoming;
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp
index f6fd6a92563..f262d09979f 100755
--- a/cpp/src/IceSSL/Util.cpp
+++ b/cpp/src/IceSSL/Util.cpp
@@ -8,7 +8,7 @@
// **********************************************************************
#include <IceUtil/Config.h>
-#if defined(_WIN32) && !defined(ICE_OS_WINRT)
+#if defined(_WIN32) && !defined(ICE_OS_UWP)
# include <winsock2.h>
#endif
@@ -23,7 +23,7 @@
#include <Ice/StringConverter.h>
#include <fstream>
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
# include <ppltasks.h>
#endif
@@ -40,7 +40,7 @@ using namespace Ice;
using namespace IceUtil;
using namespace IceSSL;
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
using namespace concurrency;
using namespace Platform;
using namespace Windows::Foundation;
@@ -1692,7 +1692,7 @@ IceSSL::findCertificates(const string& location, const string& name, const strin
}
return certs;
}
-#elif defined (ICE_OS_WINRT)
+#elif defined (ICE_OS_UWP)
namespace
{
diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h
index f10f5f25a72..fc6af1020cc 100644
--- a/cpp/src/IceSSL/Util.h
+++ b/cpp/src/IceSSL/Util.h
@@ -202,7 +202,7 @@ CFArrayRef findCertificateChain(const std::string&, const std::string&, const st
#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_WINRT)
+#elif defined(ICE_OS_UWP)
Windows::Security::Cryptography::Certificates::Certificate^
importPersonalCertificate(const std::string&, std::function<std::string()>, bool, int);
diff --git a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj
index 2387a31de6f..318e38a3785 100644
--- a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj
+++ b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj
@@ -147,8 +147,8 @@
<ClCompile Include="..\..\SSLEngine.cpp" />
<ClCompile Include="..\..\TrustManager.cpp" />
<ClCompile Include="..\..\Util.cpp" />
- <ClCompile Include="..\..\WinRTEngine.cpp" />
- <ClCompile Include="..\..\WinRTTransceiverI.cpp" />
+ <ClCompile Include="..\..\UWPEngine.cpp" />
+ <ClCompile Include="..\..\UWPTransceiverI.cpp" />
<ClCompile Include="ARM\Debug\ConnectionInfo.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
diff --git a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj.filters b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj.filters
index e3eed3add57..2540bd3e82d 100644
--- a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj.filters
+++ b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj.filters
@@ -129,7 +129,7 @@
<ClCompile Include="..\..\TrustManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\WinRTTransceiverI.cpp">
+ <ClCompile Include="..\..\UWPTransceiverI.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\PluginI.cpp">
@@ -141,7 +141,7 @@
<ClCompile Include="..\..\Util.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\WinRTEngine.cpp">
+ <ClCompile Include="..\..\UWPEngine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\RFC2253.cpp">