zeroc-ice 3.7.3 → 3.7.7

data/ext/ice/cpp/include/IceSSL/Plugin.h

@@ -31,6 +31,130 @@
 namespace IceSSL
 {
 
+/**
+ * The reason for an IceSSL certificate verification failure.
+ */
+#ifdef ICE_CPP11_MAPPING
+enum class TrustError : unsigned char
+#else
+enum TrustError
+#endif
+{
+    /** The certification verification succeed  */
+    NoError = 0,
+    /** The certificate chain length is greater than the specified maximum depth **/
+    ChainTooLong,
+    /** The X509 chain is invalid because a certificate has excluded a name constraint **/
+    HasExcludedNameConstraint,
+    /** The certificate has an undefined name constraint **/
+    HasNonDefinedNameConstraint,
+    /** The certificate has a non permitted name constraint **/
+    HasNonPermittedNameConstraint,
+    /** The certificate does not support a critical extension **/
+    HasNonSupportedCriticalExtension,
+    /** The certificate does not have a supported name constraint or has a name constraint that is unsupported **/
+    HasNonSupportedNameConstraint,
+    /** A host name mismatch has occurred **/
+    HostNameMismatch,
+    /** The X509 chain is invalid due to invalid basic constraints **/
+    InvalidBasicConstraints,
+    /** The X509 chain is invalid due to an invalid extension **/
+    InvalidExtension,
+    /** The X509 chain is invalid due to invalid name constraints **/
+    InvalidNameConstraints,
+    /** The X509 chain is invalid due to invalid policy constraints **/
+    InvalidPolicyConstraints,
+    /** The supplied certificate cannot be used for the specified purpose **/
+    InvalidPurpose,
+    /** The X509 chain is invalid due to an invalid certificate signature **/
+    InvalidSignature,
+    /** The X509 chain is not valid due to an invalid time value, such as a value that indicates an expired
+        certificate **/
+    InvalidTime,
+    /** The certificate is explicitly not trusted **/
+    NotTrusted,
+    /** The X509 chain could not be built up to the root certificate **/
+    PartialChain,
+    /** It is not possible to determine whether the certificate has been revoked **/
+    RevocationStatusUnknown,
+    /** The X509 chain is invalid due to a revoked certificate **/
+    Revoked,
+    /** The X509 chain is invalid due to an untrusted root certificate **/
+    UntrustedRoot,
+    /** The X509 chain is invalid due to other unknown failure **/
+    UnknownTrustFailure,
+};
+
+ICESSL_API TrustError getTrustError(const IceSSL::ConnectionInfoPtr&);
+ICESSL_API std::string getTrustErrorDescription(TrustError);
+ICESSL_API std::string getHost(const IceSSL::ConnectionInfoPtr&);
+
+/**
+ * The key usage "digitalSignature" bit is set
+ */
+const unsigned int KEY_USAGE_DIGITAL_SIGNATURE = 1u << 0;
+/**
+ * The key usage "nonRepudiation" bit is set
+ */
+const unsigned int KEY_USAGE_NON_REPUDIATION = 1u << 1;
+/**
+ * The key usage "keyEncipherment" bit is set
+ */
+const unsigned int KEY_USAGE_KEY_ENCIPHERMENT = 1u << 2;
+/**
+ * The key usage "dataEncipherment" bit is set
+ */
+const unsigned int KEY_USAGE_DATA_ENCIPHERMENT = 1u << 3;
+/**
+ * The key usage "keyAgreement" bit is set
+ */
+const unsigned int KEY_USAGE_KEY_AGREEMENT = 1u << 4;
+/**
+ * The key usage "keyCertSign" bit is set
+ */
+const unsigned int KEY_USAGE_KEY_CERT_SIGN = 1u << 5;
+/**
+ * The key usage "cRLSign" bit is set
+ */
+const unsigned int KEY_USAGE_CRL_SIGN = 1u << 6;
+/**
+ * The key usage "encipherOnly" bit is set
+ */
+const unsigned int KEY_USAGE_ENCIPHER_ONLY = 1u << 7;
+/**
+ * The key usage "decipherOnly" bit is set
+ */
+const unsigned int KEY_USAGE_DECIPHER_ONLY = 1u << 8;
+
+/**
+ * The extended key usage "anyKeyUsage" bit is set
+ */
+const unsigned int EXTENDED_KEY_USAGE_ANY_KEY_USAGE = 1u << 0;
+/**
+ * The extended key usage "serverAuth" bit is set
+ */
+const unsigned int EXTENDED_KEY_USAGE_SERVER_AUTH = 1u << 1;
+/**
+ * The extended key usage "clientAuth" bit is set
+ */
+const unsigned int EXTENDED_KEY_USAGE_CLIENT_AUTH = 1u << 2;
+/**
+ * The extended key usage "codeSigning" bit is set
+ */
+const unsigned int EXTENDED_KEY_USAGE_CODE_SIGNING = 1u << 3;
+/**
+ * The extended key usage "emailProtection" bit is set
+ */
+const unsigned int EXTENDED_KEY_USAGE_EMAIL_PROTECTION = 1u << 4;
+/**
+ * The extended key usage "timeStamping" bit is set
+ */
+const unsigned int EXTENDED_KEY_USAGE_TIME_STAMPING = 1u << 5;
+/**
+ * The extended key usage "OCSPSigning" bit is set
+ */
+const unsigned int EXTENDED_KEY_USAGE_OCSP_SIGNING = 1u << 6;
+
 /**
  * Thrown if the certificate cannot be read.
  * \headerfile IceSSL/IceSSL.h
@@ -343,6 +467,24 @@ public:
     virtual bool checkValidity(const IceUtil::Time& t) const = 0;
 #endif
 
+    /**
+     * Returns the value of the key usage extension. The flags <b>KEY_USAGE_DIGITAL_SIGNATURE</b>,
+     * <b>KEY_USAGE_NON_REPUDIATION</b>, <b>KEY_USAGE_KEY_ENCIPHERMENT</b>, <b>KEY_USAGE_DATA_ENCIPHERMENT</b>
+     * <b>KEY_USAGE_KEY_AGREEMENT</b>, <b>KEY_USAGE_KEY_CERT_SIGN</b>, <b>KEY_USAGE_CRL_SIGN</b>,
+     * <b>KEY_USAGE_ENCIPHER_ONLY</b> and <b>KEY_USAGE_DECIPHER_ONLY</b> can be used to check what
+     * key usage bits are set.
+     */
+    unsigned int getKeyUsage() const;
+
+    /**
+     * Returns the value of the extended key usage extension. The flags <b>EXTENDED_KEY_USAGE_ANY_KEY_USAGE</b>,
+     * <b>EXTENDED_KEY_USAGE_SERVER_AUTH</b>, <b>EXTENDED_KEY_USAGE_CLIENT_AUTH</b>,
+     * <b>EXTENDED_KEY_USAGE_CODE_SIGNING</b>, <b>EXTENDED_KEY_USAGE_EMAIL_PROTECTION</b>,
+     * <b>EXTENDED_KEY_USAGE_TIME_STAMPING</b> and <b>EXTENDED_KEY_USAGE_OCSP_SIGNING</b> can be used to check what
+     * extended key usage bits are set.
+     */
+    unsigned int getExtendedKeyUsage() const;
+
     /**
      * Obtains the not-after validity time.
      * @return The time after which this certificate is invalid.

data/ext/ice/cpp/include/IceUtil/Config.h

@@ -39,6 +39,7 @@
       defined(_M_IA64)     || \
       defined(__alpha__)   || \
       defined(__ARMEL__)   || \
+      defined(_M_ARM64)    || \
       defined(_M_ARM_FP)   || \
       defined(__arm64)     || \
       defined(__MIPSEL__)
@@ -283,8 +284,8 @@
 //
 // The Ice version.
 //
-#define ICE_STRING_VERSION "3.7.3" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30703      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_STRING_VERSION "3.7.7" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 30707      // AABBCC, with AA=major, BB=minor, CC=patch
 #define ICE_SO_VERSION "37"      // "ABC", with A=major, B=minor, C=patch
 
 #if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS)

data/ext/ice/cpp/include/IceUtil/Functional.h

@@ -5,7 +5,9 @@
 #ifndef ICE_UTIL_FUNCTIONAL_H
 #define ICE_UTIL_FUNCTIONAL_H
 
-#ifndef ICE_CPP11_MAPPING
+#include <IceUtil/Config.h>
+
+#if !defined(ICE_CPP11_MAPPING) && (ICE_CPLUSPLUS < 201703L)
 
 #include <IceUtil/Handle.h>
 #include <functional>

data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h

@@ -16,7 +16,7 @@ class MutexPtrLock
 {
 public:
 
-    MutexPtrLock<T>(const T* mutex) :
+    MutexPtrLock(T* mutex) :
         _mutex(mutex),
         _acquired(false)
     {
@@ -27,7 +27,7 @@ public:
         }
     }
 
-    ~MutexPtrLock<T>()
+    ~MutexPtrLock()
     {
         if(_mutex && _acquired)
         {
@@ -66,8 +66,8 @@ private:
 
     // Not implemented; prevents accidental use.
     //
-    MutexPtrLock<T>(const MutexPtrLock<T>&);
-    MutexPtrLock<T>& operator=(const MutexPtrLock<T>&);
+    MutexPtrLock(const MutexPtrLock<T>&);
+    MutexPtrLock& operator=(const MutexPtrLock<T>&);
 
     const T* _mutex;
     mutable bool _acquired;

data/ext/ice/cpp/include/IceUtil/ResourceConfig.h

@@ -7,8 +7,8 @@
 
 #include "winver.h"
 
-#define ICE_VERSION 3,7,3,0
-#define ICE_STRING_VERSION "3.7.3\0"
+#define ICE_VERSION 3,7,7,0
+#define ICE_STRING_VERSION "3.7.7\0"
 #define ICE_SO_VERSION "37\0"
 #define ICE_COMPANY_NAME "ZeroC, Inc.\0"
 #define ICE_COPYRIGHT "\251 ZeroC, Inc.\0"

data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.3
+// Ice version 3.7.7
 //
 // <auto-generated>
 //
@@ -35,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 7
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/Communicator.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.3
+// Ice version 3.7.7
 //
 // <auto-generated>
 //
@@ -56,7 +56,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 7
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -513,7 +513,7 @@ public:
      * If Ice.Admin.ServerId is set and the provided object adapter has a {@link Locator},
      * createAdmin registers the Admin's Process facet with the {@link Locator}'s {@link LocatorRegistry}.
      *
-     * createAdmin call only be called once; subsequent calls raise InitializationException.
+     * createAdmin must only be called once; subsequent calls raise InitializationException.
      * @param adminAdapter The object adapter used to host the Admin object; if null and
      * Ice.Admin.Endpoints is set, create, activate and use the Ice.Admin object adapter.
      * @param adminId The identity of the Admin object.
@@ -688,6 +688,12 @@ public:
 
     virtual ~Communicator();
 
+#ifdef ICE_CPP11_COMPILER
+    Communicator() = default;
+    Communicator(const Communicator&) = default;
+    Communicator& operator=(const Communicator&) = default;
+#endif
+
     /**
      * Destroy the communicator. This operation calls {@link #shutdown}
      * implicitly.  Calling {@link #destroy} cleans up memory, and shuts down
@@ -1069,7 +1075,7 @@ public:
      * If Ice.Admin.ServerId is set and the provided object adapter has a {@link Locator},
      * createAdmin registers the Admin's Process facet with the {@link Locator}'s {@link LocatorRegistry}.
      *
-     * createAdmin call only be called once; subsequent calls raise InitializationException.
+     * createAdmin must only be called once; subsequent calls raise InitializationException.
      * @param adminAdapter The object adapter used to host the Admin object; if null and
      * Ice.Admin.Endpoints is set, create, activate and use the Ice.Admin object adapter.
      * @param adminId The identity of the Admin object.

data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.3
+// Ice version 3.7.7
 //
 // <auto-generated>
 //
@@ -35,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 7
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/Connection.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.3
+// Ice version 3.7.7
 //
 // <auto-generated>
 //
@@ -39,7 +39,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 7
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -235,10 +235,10 @@ public:
      * @param connectionId The connection id.
      */
     ConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId) :
-        underlying(::std::move(underlying)),
+        underlying(underlying),
         incoming(incoming),
-        adapterName(::std::move(adapterName)),
-        connectionId(::std::move(connectionId))
+        adapterName(adapterName),
+        connectionId(connectionId)
     {
     }
 
@@ -519,9 +519,9 @@ public:
     ICE_MEMBER(ICE_API) virtual ~IPConnectionInfo();
 
     IPConnectionInfo() :
-        localAddress(u8""),
+        localAddress(""),
         localPort(-1),
-        remoteAddress(u8""),
+        remoteAddress(""),
         remotePort(-1)
     {
     }
@@ -543,10 +543,10 @@ public:
      * @param remotePort The remote port.
      */
     IPConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort) :
-        ConnectionInfo(::std::move(underlying), incoming, ::std::move(adapterName), ::std::move(connectionId)),
-        localAddress(::std::move(localAddress)),
+        ConnectionInfo(underlying, incoming, adapterName, connectionId),
+        localAddress(localAddress),
         localPort(localPort),
-        remoteAddress(::std::move(remoteAddress)),
+        remoteAddress(remoteAddress),
         remotePort(remotePort)
     {
     }
@@ -604,7 +604,7 @@ public:
      * @param sndSize The connection buffer send size.
      */
     TCPConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort, int rcvSize, int sndSize) :
-        IPConnectionInfo(::std::move(underlying), incoming, ::std::move(adapterName), ::std::move(connectionId), ::std::move(localAddress), localPort, ::std::move(remoteAddress), remotePort),
+        IPConnectionInfo(underlying, incoming, adapterName, connectionId, localAddress, localPort, remoteAddress, remotePort),
         rcvSize(rcvSize),
         sndSize(sndSize)
     {
@@ -658,8 +658,8 @@ public:
      * @param sndSize The connection buffer send size.
      */
     UDPConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort, const ::std::string& mcastAddress, int mcastPort, int rcvSize, int sndSize) :
-        IPConnectionInfo(::std::move(underlying), incoming, ::std::move(adapterName), ::std::move(connectionId), ::std::move(localAddress), localPort, ::std::move(remoteAddress), remotePort),
-        mcastAddress(::std::move(mcastAddress)),
+        IPConnectionInfo(underlying, incoming, adapterName, connectionId, localAddress, localPort, remoteAddress, remotePort),
+        mcastAddress(mcastAddress),
         mcastPort(mcastPort),
         rcvSize(rcvSize),
         sndSize(sndSize)
@@ -710,8 +710,8 @@ public:
      * @param headers The headers from the HTTP upgrade request.
      */
     WSConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::Ice::HeaderDict& headers) :
-        ConnectionInfo(::std::move(underlying), incoming, ::std::move(adapterName), ::std::move(connectionId)),
-        headers(::std::move(headers))
+        ConnectionInfo(underlying, incoming, adapterName, connectionId),
+        headers(headers)
     {
     }
 
@@ -1053,6 +1053,11 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    ConnectionInfo(const ConnectionInfo&) = default;
+    ConnectionInfo& operator=(const ConnectionInfo&) = default;
+#endif
+
     /**
      * The information of the underyling transport or null if there's
      * no underlying transport.
@@ -1099,6 +1104,12 @@ public:
 
     virtual ~CloseCallback();
 
+#ifdef ICE_CPP11_COMPILER
+    CloseCallback() = default;
+    CloseCallback(const CloseCallback&) = default;
+    CloseCallback& operator=(const CloseCallback&) = default;
+#endif
+
     /**
      * This method is called by the the connection when the connection
      * is closed. If the callback needs more information about the closure,
@@ -1134,6 +1145,12 @@ public:
 
     virtual ~HeartbeatCallback();
 
+#ifdef ICE_CPP11_COMPILER
+    HeartbeatCallback() = default;
+    HeartbeatCallback(const HeartbeatCallback&) = default;
+    HeartbeatCallback& operator=(const HeartbeatCallback&) = default;
+#endif
+
     /**
      * This method is called by the the connection when a heartbeat is
      * received from the peer.
@@ -1166,6 +1183,12 @@ public:
 
     virtual ~Connection();
 
+#ifdef ICE_CPP11_COMPILER
+    Connection() = default;
+    Connection(const Connection&) = default;
+    Connection& operator=(const Connection&) = default;
+#endif
+
     /**
      * Manually close the connection using the specified closure mode.
      * @param mode Determines how the connection will be closed.
@@ -1432,6 +1455,11 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    IPConnectionInfo(const IPConnectionInfo&) = default;
+    IPConnectionInfo& operator=(const IPConnectionInfo&) = default;
+#endif
+
     /**
      * The local address.
      */
@@ -1501,6 +1529,11 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    TCPConnectionInfo(const TCPConnectionInfo&) = default;
+    TCPConnectionInfo& operator=(const TCPConnectionInfo&) = default;
+#endif
+
     /**
      * The connection buffer receive size.
      */
@@ -1567,6 +1600,11 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    UDPConnectionInfo(const UDPConnectionInfo&) = default;
+    UDPConnectionInfo& operator=(const UDPConnectionInfo&) = default;
+#endif
+
     /**
      * The multicast address.
      */
@@ -1627,6 +1665,11 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    WSConnectionInfo(const WSConnectionInfo&) = default;
+    WSConnectionInfo& operator=(const WSConnectionInfo&) = default;
+#endif
+
     /**
      * The headers from the HTTP upgrade request.
      */

data/ext/ice/cpp/include/generated/Ice/ConnectionF.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.3
+// Ice version 3.7.7
 //
 // <auto-generated>
 //
@@ -35,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 7
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/Current.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.3
+// Ice version 3.7.7
 //
 // <auto-generated>
 //
@@ -39,7 +39,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 3
+#   if ICE_INT_VERSION % 100 < 7
 #       error Ice patch level mismatch!
 #   endif
 #endif