zeroc-ice 3.7.0 → 3.7.5

data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h

@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
 #define ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
 
+#ifdef __APPLE__
+
 #include <IceSSL/Config.h>
 #include <IceSSL/InstanceF.h>
 #include <IceSSL/SecureTransportEngineF.h>
@@ -75,7 +72,7 @@ private:
         SSLWantWrite = 0x2
     };
 
-    mutable Ice::Byte _flags;
+    mutable Ice::Byte _tflags;
     size_t _maxSendPacketSize;
     size_t _maxRecvPacketSize;
     std::string _cipher;
@@ -90,3 +87,5 @@ typedef IceUtil::Handle<TransceiverI> TransceiverIPtr;
 } // IceSSL namespace end
 
 #endif
+
+#endif

data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/SecureTransportUtil.h>
 #include <IceSSL/Plugin.h>
@@ -41,12 +36,13 @@ readCertFile(const string& file)
     }
 
     is.seekg(0, is.end);
-    size_t size = is.tellg();
+    size_t size = static_cast<size_t>(is.tellg());
     is.seekg(0, is.beg);
 
-    UniqueRef<CFMutableDataRef> data(CFDataCreateMutable(kCFAllocatorDefault, size));
-    CFDataSetLength(data.get(), size);
-    is.read(reinterpret_cast<char*>(CFDataGetMutableBytePtr(data.get())), size);
+    UniqueRef<CFMutableDataRef> data(CFDataCreateMutable(kCFAllocatorDefault, static_cast<CFIndex>(size)));
+    CFDataSetLength(data.get(), static_cast<CFIndex>(size));
+    is.read(reinterpret_cast<char*>(CFDataGetMutableBytePtr(data.get())),
+            static_cast<streamsize>(size));
     if(!is.good())
     {
         throw CertificateReadException(__FILE__, __LINE__, "error reading file " + file);
@@ -117,7 +113,7 @@ isCA(SecCertificateRef cert)
     if(property)
     {
         CFArrayRef propertyValues = static_cast<CFArrayRef>(CFDictionaryGetValue(property.get(), kSecPropertyKeyValue));
-        for(int i = 0, size = CFArrayGetCount(propertyValues); i < size; ++i)
+        for(CFIndex i = 0, size = CFArrayGetCount(propertyValues); i < size; ++i)
         {
             CFDictionaryRef dict = static_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(propertyValues, i));
             CFStringRef label = static_cast<CFStringRef>(CFDictionaryGetValue(dict, kSecPropertyKeyLabel));
@@ -248,7 +244,7 @@ openKeychain(const std::string& path, const std::string& keychainPassword)
     if(err == noErr)
     {
         const char* pass = keychainPassword.empty() ? 0 : keychainPassword.c_str();
-        if((err = SecKeychainUnlock(keychain.get(), keychainPassword.size(), pass, pass != 0)))
+        if((err = SecKeychainUnlock(keychain.get(), static_cast<UInt32>(keychainPassword.size()), pass, pass != 0)))
         {
             throw PluginInitializationException(__FILE__, __LINE__,
                                                 "IceSSL: unable to unlock keychain:\n" + sslErrorToString(err));
@@ -258,7 +254,8 @@ openKeychain(const std::string& path, const std::string& keychainPassword)
     {
         const char* pass = keychainPassword.empty() ? 0 : keychainPassword.c_str();
         keychain.reset(0);
-        if((err = SecKeychainCreate(keychainPath.c_str(), keychainPassword.size(), pass, pass == 0, 0, &keychain.get())))
+        if((err = SecKeychainCreate(keychainPath.c_str(),
+                                    static_cast<UInt32>(keychainPassword.size()), pass, pass == 0, 0, &keychain.get())))
         {
             throw PluginInitializationException(__FILE__, __LINE__,
                                                 "IceSSL: unable to create keychain:\n" + sslErrorToString(err));
@@ -359,15 +356,15 @@ loadPrivateKey(const string& file, SecCertificateRef cert, SecKeychainRef keycha
     // private key into the keychain and add the certificate.
     //
     UniqueRef<CFArrayRef> items(loadKeychainItems(file, kSecItemTypePrivateKey, keychain, password, prompt, retryMax));
-    int count = CFArrayGetCount(items.get());
+    CFIndex count = CFArrayGetCount(items.get());
     UniqueRef<SecKeyRef> key;
-    for(int i = 0; i < count; ++i)
+    for(CFIndex i = 0; i < count; ++i)
     {
-        SecKeychainItemRef item =
+        SecKeychainItemRef itemRef =
             static_cast<SecKeychainItemRef>(const_cast<void*>(CFArrayGetValueAtIndex(items.get(), 0)));
-        if(SecKeyGetTypeID() == CFGetTypeID(item))
+        if(SecKeyGetTypeID() == CFGetTypeID(itemRef))
         {
-            key.retain(reinterpret_cast<SecKeyRef>(item));
+            key.retain(reinterpret_cast<SecKeyRef>(itemRef));
             break;
         }
     }
@@ -410,7 +407,7 @@ loadPrivateKey(const string& file, SecCertificateRef cert, SecKeychainRef keycha
         SecKeychainAttribute attr;
         attr.tag = kSecKeyLabel;
         attr.data = const_cast<UInt8*>(CFDataGetBytePtr(hash.get()));
-        attr.length = CFDataGetLength(hash.get());
+        attr.length = static_cast<UInt32>(CFDataGetLength(hash.get()));
         attributes.push_back(attr);
     }
 
@@ -426,13 +423,13 @@ loadPrivateKey(const string& file, SecCertificateRef cert, SecKeychainRef keycha
         SecKeychainAttribute attr;
         attr.tag = kSecKeyPrintName;
         attr.data = const_cast<char*>(label.c_str());
-        attr.length = label.size();
+        attr.length = static_cast<UInt32>(label.size());
         attributes.push_back(attr);
     }
 
     SecKeychainAttributeList attrs;
     attrs.attr = &attributes[0];
-    attrs.count = attributes.size();
+    attrs.count = static_cast<UInt32>(attributes.size());
     SecKeychainItemModifyAttributesAndData(reinterpret_cast<SecKeychainItemRef>(key.get()), &attrs, 0, 0);
 
     UniqueRef<SecIdentityRef> identity;
@@ -473,9 +470,8 @@ loadCerts(const string& file)
                 endpos = strbuf.find("-----END CERTIFICATE-----", startpos);
                 if(endpos == string::npos)
                 {
-                    InitializationException ex(__FILE__, __LINE__);
-                    ex.reason = "IceSSL: certificate " + file + " is not a valid PEM-encoded certificate";
-                    throw ex;
+                    throw InitializationException(__FILE__, __LINE__, "IceSSL: certificate " + file +
+                                                  " is not a valid PEM-encoded certificate");
                 }
                 size = endpos - startpos;
             }
@@ -491,13 +487,13 @@ loadCerts(const string& file)
             }
 
             vector<unsigned char> data(IceInternal::Base64::decode(string(&buffer[startpos], size)));
-            UniqueRef<CFDataRef> certdata(CFDataCreate(kCFAllocatorDefault, &data[0], data.size()));
+            UniqueRef<CFDataRef> certdata(CFDataCreate(kCFAllocatorDefault, &data[0],
+                                                       static_cast<CFIndex>(data.size())));
             UniqueRef<SecCertificateRef> cert(SecCertificateCreateWithData(0, certdata.get()));
             if(!cert)
             {
-                InitializationException ex(__FILE__, __LINE__);
-                ex.reason = "IceSSL: certificate " + file + " is not a valid PEM-encoded certificate";
-                throw ex;
+                throw InitializationException(__FILE__, __LINE__, "IceSSL: certificate " + file +
+                                              " is not a valid PEM-encoded certificate");
             }
             CFArrayAppendValue(const_cast<CFMutableArrayRef>(certs.get()), cert.get());
             first = false;
@@ -509,9 +505,8 @@ loadCerts(const string& file)
         UniqueRef<SecCertificateRef> cert(SecCertificateCreateWithData(0, data.get()));
         if(!cert)
         {
-            InitializationException ex(__FILE__, __LINE__);
-            ex.reason = "IceSSL: certificate " + file + " is not a valid DER-encoded certificate";
-            throw ex;
+            throw InitializationException(__FILE__, __LINE__, "IceSSL: certificate " + file +
+                                          " is not a valid DER-encoded certificate");
         }
         CFArrayAppendValue(const_cast<CFMutableArrayRef>(certs.get()), cert.get());
     }
@@ -527,9 +522,15 @@ loadCerts(const string& file)
 //
 CFArrayRef
 IceSSL::SecureTransport::loadCertificateChain(const string& file,
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+                                              const string& /*keyFile*/,
+                                              const std::string& /*keychainPath*/,
+                                              const string& /*keychainPassword*/,
+#else
                                               const string& keyFile,
                                               const std::string& keychainPath,
                                               const string& keychainPassword,
+#endif
                                               const string& password,
                                               const PasswordPromptPtr& prompt,
                                               int retryMax)
@@ -639,7 +640,7 @@ IceSSL::SecureTransport::loadCACertificates(const string& file)
 #else
     UniqueRef<CFArrayRef> items(loadKeychainItems(file, kSecItemTypeCertificate, 0, "", 0, 0));
     UniqueRef<CFArrayRef> certificateAuthorities(CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks));
-    int count = CFArrayGetCount(items.get());
+    CFIndex count = CFArrayGetCount(items.get());
     for(CFIndex i = 0; i < count; ++i)
     {
         SecCertificateRef cert =
@@ -655,9 +656,15 @@ IceSSL::SecureTransport::loadCACertificates(const string& file)
 }
 
 CFArrayRef
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+IceSSL::SecureTransport::findCertificateChain(const std::string&,
+                                              const std::string&,
+                                              const string& value)
+#else
 IceSSL::SecureTransport::findCertificateChain(const std::string& keychainPath,
                                               const std::string& keychainPassword,
                                               const string& value)
+#endif
 {
     //
     //  Search the keychain using key:value pairs. The following keys are supported:
@@ -756,7 +763,7 @@ IceSSL::SecureTransport::findCertificateChain(const std::string& keychainPath,
             {
                 throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: invalid value `" + value + "'");
             }
-            UniqueRef<CFDataRef> v(CFDataCreate(kCFAllocatorDefault, &buffer[0], buffer.size()));
+            UniqueRef<CFDataRef> v(CFDataCreate(kCFAllocatorDefault, &buffer[0], static_cast<CFIndex>(buffer.size())));
             CFDictionarySetValue(query.get(), field == "SUBJECTKEYID" ? kSecAttrSubjectKeyID : kSecAttrSerialNumber,
                                  v.get());
             valid = true;
@@ -796,7 +803,7 @@ IceSSL::SecureTransport::findCertificateChain(const std::string& keychainPath,
                                             "IceSSL: error evaluating trust:\n" + sslErrorToString(err));
     }
 
-    int chainLength = SecTrustGetCertificateCount(trust.get());
+    CFIndex chainLength = SecTrustGetCertificateCount(trust.get());
     UniqueRef<CFArrayRef> items(CFArrayCreateMutable(kCFAllocatorDefault, chainLength, &kCFTypeArrayCallBacks));
     for(int i = 0; i < chainLength; ++i)
     {

data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h

@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_SECURE_TRANSPORT_UTIL_H
 #define ICESSL_SECURE_TRANSPORT_UTIL_H
 
+#ifdef __APPLE__
+
 #include <IceSSL/SecureTransport.h>
 #include <IceSSL/Util.h>
 
@@ -44,3 +41,5 @@ CFArrayRef findCertificateChain(const std::string&, const std::string&, const st
 } // IceSSL namespace end
 
 #endif
+
+#endif

data/ext/ice/cpp/src/IceSSL/TrustManager.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/TrustManager.h>
 #include <IceSSL/RFC2253.h>
@@ -54,11 +49,10 @@ TrustManager::TrustManager(const Ice::CommunicatorPtr& communicator) :
             }
         }
     }
-    catch(const ParseException& e)
+    catch(const ParseException& ex)
     {
-        Ice::PluginInitializationException ex(__FILE__, __LINE__);
-        ex.reason = "IceSSL: invalid property " + key  + ":\n" + e.reason;
-        throw ex;
+        throw Ice::PluginInitializationException(__FILE__, __LINE__, "IceSSL: invalid property " + key  + ":\n" +
+                                                 ex.reason);
     }
 }
 

data/ext/ice/cpp/src/IceSSL/TrustManager.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_TRUST_MANAGER_H
 #define ICESSL_TRUST_MANAGER_H

data/ext/ice/cpp/src/IceSSL/TrustManagerF.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_TRUST_MANAGER_F_H
 #define ICESSL_TRUST_MANAGER_F_H

data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // UWP Certificate implementation
@@ -224,11 +219,11 @@ UWP::Certificate::create(Windows::Security::Cryptography::Certificates::Certific
 }
 
 UWP::CertificatePtr
-UWP::Certificate::load(const std::string& file)
+UWP::Certificate::load(const std::string& filename)
 {
     try
     {
-        auto uri = ref new Uri(ref new String(stringToWstring(file).c_str()));
+        auto uri = ref new Uri(ref new String(stringToWstring(filename).c_str()));
         auto file = create_task(StorageFile::GetFileFromApplicationUriAsync(uri)).get();
         auto buffer = create_task(FileIO::ReadTextAsync(file)).get();
         return UWP::Certificate::decode(wstringToString(buffer->Data()));
@@ -237,7 +232,7 @@ UWP::Certificate::load(const std::string& file)
     {
         if(HRESULT_CODE(ex->HResult) == ERROR_FILE_NOT_FOUND)
         {
-            throw CertificateReadException(__FILE__, __LINE__, "error opening file :" + file);
+            throw CertificateReadException(__FILE__, __LINE__, "error opening file :" + filename);
         }
         else
         {

data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/Config.h>
 
@@ -104,10 +99,10 @@ importPfxData(String^ friendlyName, String^ data, String^ password)
 }
 
 Certificates::Certificate^
-importPersonalCertificate(const string& file, function<string ()> password, bool passwordPrompt,
+importPersonalCertificate(const string& filename, function<string ()> password, bool passwordPrompt,
                           int passwordRetryMax)
 {
-    auto uri = ref new Uri(ref new String(stringToWstring(file).c_str()));
+    auto uri = ref new Uri(ref new String(stringToWstring(filename).c_str()));
     try
     {
         auto file = IceInternal::runSync(StorageFile::GetFileFromApplicationUriAsync(uri));
@@ -153,7 +148,7 @@ importPersonalCertificate(const string& file, function<string ()> password, bool
     {
         if(HRESULT_CODE(ex->HResult) == ERROR_FILE_NOT_FOUND)
         {
-            throw PluginInitializationException(__FILE__, __LINE__, "certificate file not found:\n" + file);
+            throw PluginInitializationException(__FILE__, __LINE__, "certificate file not found:\n" + filename);
         }
         else
         {

data/ext/ice/cpp/src/IceSSL/UWPEngine.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_UWP_ENGINE_H
 #define ICESSL_UWP_ENGINE_H

data/ext/ice/cpp/src/IceSSL/UWPEngineF.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_UWP_ENGINE_F_H
 #define ICESSL_UWP_ENGINE_F_H

data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/PluginI.h>
 #include <IceSSL/UWPEngine.h>

data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/Config.h>
 #include <IceSSL/UWPTransceiverI.h>
@@ -289,7 +284,7 @@ UWP::TransceiverI::finishWrite(IceInternal::Buffer& buf)
     if(_connected && !_upgraded)
     {
         IceInternal::AsyncInfo* asyncInfo = getNativeInfo()->getAsyncInfo(IceInternal::SocketOperationWrite);
-        if(asyncInfo->count == SOCKET_ERROR)
+        if(asyncInfo->error != ERROR_SUCCESS)
         {
             if(CERT_E_CN_NO_MATCH == asyncInfo->error)
             {
@@ -368,9 +363,9 @@ UWP::TransceiverI::setBufferSize(int rcvSize, int sndSize)
 }
 
 UWP::TransceiverI::TransceiverI(const InstancePtr& instance,
-                                   const IceInternal::TransceiverPtr& delegate,
-                                   const string& hostOrAdapterName,
-                                   bool incoming) :
+                                const IceInternal::TransceiverPtr& delegate,
+                                const string& hostOrAdapterName,
+                                bool incoming) :
     _instance(instance),
     _engine(UWP::SSLEnginePtr::dynamicCast(instance->engine())),
     _host(incoming ? "" : hostOrAdapterName),