zeroc-ice 3.7.10__tar.gz → 3.7.10.1__tar.gz

{zeroc-ice-3.7.10/lib/zeroc_ice.egg-info → zeroc_ice-3.7.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zeroc-ice
-Version: 3.7.10
+Version: 3.7.10.1
 Summary: Ice is a comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more.
 Home-page: https://zeroc.com
 Author: ZeroC, Inc.

{zeroc-ice-3.7.10 → zeroc_ice-3.7.10.1/lib/zeroc_ice.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zeroc-ice
-Version: 3.7.10
+Version: 3.7.10.1
 Summary: Ice is a comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more.
 Home-page: https://zeroc.com
 Author: ZeroC, Inc.

{zeroc-ice-3.7.10 → zeroc_ice-3.7.10.1}/lib/zeroc_ice.egg-info/SOURCES.txt

@@ -277,7 +277,6 @@ src/ice/cpp/include/IceSSL/OpenSSL.h
 src/ice/cpp/include/IceSSL/Plugin.h
 src/ice/cpp/include/IceSSL/SChannel.h
 src/ice/cpp/include/IceSSL/SecureTransport.h
-src/ice/cpp/include/IceSSL/UWP.h
 src/ice/cpp/include/IceUtil/Atomic.h
 src/ice/cpp/include/IceUtil/Cond.h
 src/ice/cpp/include/IceUtil/Config.h
@@ -654,13 +653,6 @@ src/ice/cpp/src/IceSSL/SecureTransportUtil.h
 src/ice/cpp/src/IceSSL/TrustManager.cpp
 src/ice/cpp/src/IceSSL/TrustManager.h
 src/ice/cpp/src/IceSSL/TrustManagerF.h
-src/ice/cpp/src/IceSSL/UWPCertificateI.cpp
-src/ice/cpp/src/IceSSL/UWPEngine.cpp
-src/ice/cpp/src/IceSSL/UWPEngine.h
-src/ice/cpp/src/IceSSL/UWPEngineF.h
-src/ice/cpp/src/IceSSL/UWPPluginI.cpp
-src/ice/cpp/src/IceSSL/UWPTransceiverI.cpp
-src/ice/cpp/src/IceSSL/UWPTransceiverI.h
 src/ice/cpp/src/IceSSL/Util.cpp
 src/ice/cpp/src/IceSSL/Util.h
 src/ice/cpp/src/IceUtil/ConsoleUtil.cpp

{zeroc-ice-3.7.10 → zeroc_ice-3.7.10.1}/setup.py

@@ -197,7 +197,7 @@ class BuildExt(build_ext):
 setup(
     name='zeroc-ice',
 
-    version='3.7.10',
+    version='3.7.10.1',
 
     description="Ice is a comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more.",
 

{zeroc-ice-3.7.10 → zeroc_ice-3.7.10.1}/src/ice/mcpp/system.c

@@ -37,6 +37,10 @@
  *      2. append the system-dependent routines in this file.
  */
 
+#ifndef _MSC_VER
+#  include <unistd.h> // For readlink()
+#endif
+
 #include    "system.H"
 #include    "internal.H"
 

zeroc-ice-3.7.10/src/ice/cpp/include/IceSSL/UWP.h

@@ -1,62 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICESSL_UWP_H
-#define ICESSL_UWP_H
-
-#include <IceSSL/Plugin.h>
-
-namespace IceSSL
-{
-
-namespace UWP
-{
-
-class Certificate;
-ICE_DEFINE_PTR(CertificatePtr, Certificate);
-
-/**
- * This convenience class is a wrapper around a native certificate.
- * \headerfile IceSSL/IceSSL.h
- */
-class ICESSL_API Certificate : public virtual IceSSL::Certificate
-{
-public:
-
-    /**
-     * Constructs a certificate using a native certificate.
-     * @param cert The native certificate.
-     * @return The new certificate instance.
-     */
-    static CertificatePtr create(Windows::Security::Cryptography::Certificates::Certificate^ cert);
-
-    /**
-     * Loads the certificate from a file. The certificate must use the
-     * PEM encoding format.
-     * @param file The certificate file.
-     * @return The new certificate instance.
-     * @throws CertificateReadException if the file cannot be read.
-     */
-    static CertificatePtr load(const std::string& file);
-
-    /**
-     * Decodes a certificate from a string that uses the PEM encoding format.
-     * @param str A string containing the encoded certificate.
-     * @return The new certificate instance.
-     * @throws CertificateEncodingException if an error occurs.
-     */
-    static CertificatePtr decode(const std::string& str);
-
-    /**
-     * Obtains the native X509 certificate value wrapped by this object.
-     * @return The native certificate.
-     */
-    virtual Windows::Security::Cryptography::Certificates::Certificate^ getCert() const = 0;
-};
-
-} // UWP namespace end
-
-} // IceSSL namespace end
-
-#endif

zeroc-ice-3.7.10/src/ice/cpp/src/IceSSL/UWPCertificateI.cpp

@@ -1,266 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-//
-// UWP Certificate implementation
-//
-
-#include <IceSSL/UWP.h>
-#include <IceSSL/CertificateI.h>
-#include <IceSSL/Util.h>
-
-#include <Ice/LocalException.h>
-#include <Ice/StringConverter.h>
-#include <Ice/Base64.h>
-#include <Ice/StringUtil.h>
-
-#include <ppltasks.h>
-#include <nserror.h>
-
-using namespace concurrency;
-using namespace Platform;
-using namespace Windows::Foundation;
-using namespace Windows::Storage;
-using namespace Windows::Storage::Streams;
-using namespace Windows::Security::Cryptography;
-
-using namespace Ice;
-using namespace IceSSL;
-
-using namespace std;
-
-namespace
-{
-
-class UWPCertificateI : public UWP::Certificate,
-                        public CertificateI
-{
-public:
-
-    UWPCertificateI(Windows::Security::Cryptography::Certificates::Certificate^);
-
-    virtual bool operator==(const IceSSL::Certificate&) const;
-
-    virtual vector<Ice::Byte> getAuthorityKeyIdentifier() const;
-    virtual vector<Ice::Byte> getSubjectKeyIdentifier() const;
-    virtual bool verify(const CertificatePtr&) const;
-    virtual string encode() const;
-
-    virtual chrono::system_clock::time_point getNotAfter() const;
-    virtual chrono::system_clock::time_point getNotBefore() const;
-    virtual string getSerialNumber() const;
-    virtual DistinguishedName getIssuerDN() const;
-    virtual vector<pair<int, string> > getIssuerAlternativeNames() const;
-    virtual DistinguishedName getSubjectDN() const;
-    virtual vector<pair<int, string> > getSubjectAlternativeNames() const;
-    virtual int getVersion() const;
-    virtual Windows::Security::Cryptography::Certificates::Certificate^ getCert() const;
-
-private:
-
-    Windows::Security::Cryptography::Certificates::Certificate^ _cert;
-};
-
-const Ice::Long TICKS_PER_MSECOND = 10000LL;
-const Ice::Long MSECS_TO_EPOCH = 11644473600000LL;
-
-vector<pair<int, string> >
-certificateAltNames(Windows::Security::Cryptography::Certificates::SubjectAlternativeNameInfo^ subAltNames)
-{
-    vector<pair<int, string> > altNames;
-    if(subAltNames)
-    {
-        for(auto iter = subAltNames->EmailName->First(); iter->HasCurrent; iter->MoveNext())
-        {
-            altNames.push_back(make_pair(AltNameEmail, wstringToString(iter->Current->Data())));
-        }
-        for(auto iter = subAltNames->DnsName->First(); iter->HasCurrent; iter->MoveNext())
-        {
-            altNames.push_back(make_pair(AltNameDNS, wstringToString(iter->Current->Data())));
-        }
-        for(auto iter = subAltNames->Url->First(); iter->HasCurrent; iter->MoveNext())
-        {
-            altNames.push_back(make_pair(AltNameURL, wstringToString(iter->Current->Data())));
-        }
-        for(auto iter = subAltNames->IPAddress->First(); iter->HasCurrent; iter->MoveNext())
-        {
-            altNames.push_back(make_pair(AltNAmeIP, wstringToString(iter->Current->Data())));
-        }
-    }
-    return altNames;
-}
-
-} // end anonymous namespace
-
-UWPCertificateI::UWPCertificateI(Windows::Security::Cryptography::Certificates::Certificate^ cert) : _cert(cert)
-{
-    if(!_cert)
-    {
-        throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Invalid certificate reference");
-    }
-}
-
-bool
-UWPCertificateI::operator==(const IceSSL::Certificate& r) const
-{
-    const UWPCertificateI* p = dynamic_cast<const UWPCertificateI*>(&r);
-    if(!p)
-    {
-        return false;
-    }
-
-    return CryptographicBuffer::Compare(_cert->GetCertificateBlob(), p->_cert->GetCertificateBlob());
-}
-
-vector<Ice::Byte>
-UWPCertificateI::getAuthorityKeyIdentifier() const
-{
-    throw  FeatureNotSupportedException(__FILE__, __LINE__);
-}
-
-vector<Ice::Byte>
-UWPCertificateI::getSubjectKeyIdentifier() const
-{
-    throw FeatureNotSupportedException(__FILE__, __LINE__);
-}
-
-bool
-UWPCertificateI::verify(const CertificatePtr&) const
-{
-    throw FeatureNotSupportedException(__FILE__, __LINE__);
-}
-
-string
-UWPCertificateI::encode() const
-{
-    auto reader = Windows::Storage::Streams::DataReader::FromBuffer(_cert->GetCertificateBlob());
-    std::vector<unsigned char> data(reader->UnconsumedBufferLength);
-    if(!data.empty())
-    {
-        reader->ReadBytes(Platform::ArrayReference<unsigned char>(&data[0], static_cast<unsigned int>(data.size())));
-    }
-    ostringstream os;
-    os << "-----BEGIN CERTIFICATE-----\n";
-    os << IceInternal::Base64::encode(data);
-    os << "-----END CERTIFICATE-----\n";
-    return os.str();
-}
-
-chrono::system_clock::time_point
-UWPCertificateI::getNotAfter() const
-{
-    // Convert 100ns time from January 1, 1601 to ms from January 1, 1970
-    return chrono::system_clock::time_point(
-        chrono::milliseconds(_cert->ValidTo.UniversalTime / TICKS_PER_MSECOND - MSECS_TO_EPOCH));
-}
-
-chrono::system_clock::time_point
-UWPCertificateI::getNotBefore() const
-{
-    // Convert 100ns time from January 1, 1601 to ms from January 1, 1970
-    return chrono::system_clock::time_point(
-        chrono::milliseconds(_cert->ValidFrom.UniversalTime / TICKS_PER_MSECOND - MSECS_TO_EPOCH));
-}
-
-string
-UWPCertificateI::getSerialNumber() const
-{
-    ostringstream os;
-    os.fill(0);
-    os.width(2);
-    for(unsigned int i = 0; i < _cert->SerialNumber->Length; i++)
-    {
-        os << hex << static_cast<int>(_cert->SerialNumber[i]);
-    }
-    return IceUtilInternal::toUpper(os.str());
-}
-
-DistinguishedName
-UWPCertificateI::getIssuerDN() const
-{
-    return DistinguishedName("CN=" + wstringToString(_cert->Issuer->Data()));
-}
-
-vector<pair<int, string> >
-UWPCertificateI::getIssuerAlternativeNames() const
-{
-    throw FeatureNotSupportedException(__FILE__, __LINE__);
-}
-
-DistinguishedName
-UWPCertificateI::getSubjectDN() const
-{
-    return DistinguishedName("CN=" + wstringToString(_cert->Subject->Data()));
-}
-
-vector<pair<int, string> >
-UWPCertificateI::getSubjectAlternativeNames() const
-{
-    return certificateAltNames(_cert->SubjectAlternativeName);
-}
-
-int
-UWPCertificateI::getVersion() const
-{
-    throw FeatureNotSupportedException(__FILE__, __LINE__);
-}
-
-Windows::Security::Cryptography::Certificates::Certificate^
-UWPCertificateI::getCert() const
-{
-    return _cert;
-}
-
-UWP::CertificatePtr
-UWP::Certificate::create(Windows::Security::Cryptography::Certificates::Certificate^ cert)
-{
-    return ICE_MAKE_SHARED(UWPCertificateI, cert);
-}
-
-UWP::CertificatePtr
-UWP::Certificate::load(const std::string& filename)
-{
-    try
-    {
-        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()));
-    }
-    catch(Platform::Exception^ ex)
-    {
-        if(HRESULT_CODE(ex->HResult) == ERROR_FILE_NOT_FOUND)
-        {
-            throw CertificateReadException(__FILE__, __LINE__, "error opening file :" + filename);
-        }
-        else
-        {
-            throw Ice::SyscallException(__FILE__, __LINE__, ex->HResult);
-        }
-    }
-}
-
-UWP::CertificatePtr
-UWP::Certificate::decode(const std::string& encoding)
-{
-    string::size_type size, startpos, endpos = 0;
-    startpos = encoding.find("-----BEGIN CERTIFICATE-----", endpos);
-    if (startpos != string::npos)
-    {
-        startpos += sizeof("-----BEGIN CERTIFICATE-----");
-        endpos = encoding.find("-----END CERTIFICATE-----", startpos);
-        size = endpos - startpos;
-    }
-    else
-    {
-        startpos = 0;
-        endpos = string::npos;
-        size = encoding.size();
-    }
-
-    vector<unsigned char> data(IceInternal::Base64::decode(string(&encoding[startpos], size)));
-    auto writer = ref new DataWriter();
-    writer->WriteBytes(Platform::ArrayReference<unsigned char>(&data[0], static_cast<unsigned int>(data.size())));
-    return make_shared<UWPCertificateI>(ref new Certificates::Certificate(writer->DetachBuffer()));
-}