zeroc-ice 3.8.1 → 3.8.3

data/dist/ice/cpp/src/Ice/WSTransceiver.cpp

@@ -15,6 +15,7 @@
 
 #include <climits>
 #include <cstdint>
+#include <stdexcept>
 
 using namespace std;
 using namespace Ice;
@@ -51,6 +52,23 @@ namespace
     const string _iceProtocol = "ice.zeroc.com";                   // NOLINT(cert-err58-cpp)
     const string _wsUUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; // NOLINT(cert-err58-cpp)
 
+    // Returns true if the Connection header field - a comma-separated list of tokens, already trimmed and lowercased
+    // by HttpParser::getHeader - includes the "upgrade" token required by RFC 6455 section 4.
+    bool hasUpgradeToken(string_view connectionField)
+    {
+        while (!connectionField.empty())
+        {
+            auto comma = connectionField.find(',');
+            string_view token = connectionField.substr(0, comma);
+            connectionField.remove_prefix(comma == string_view::npos ? connectionField.size() : comma + 1);
+            if (IceInternal::trim(token) == "upgrade")
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
     //
     // Rename to avoid conflict with OS 10.10 htonll
     //
@@ -124,6 +142,49 @@ namespace
     }
 }
 
+string
+IceInternal::canonicalizeOrigin(string_view origin)
+{
+    // Throws std::invalid_argument for any input that is not a serialized origin per RFC 6454.
+    auto sep = origin.find("://");
+    if (sep == string_view::npos || sep == 0)
+    {
+        throw invalid_argument{"malformed origin '" + string{origin} + "'"};
+    }
+    string scheme{origin.substr(0, sep)};
+    transform(
+        scheme.begin(),
+        scheme.end(),
+        scheme.begin(),
+        [](unsigned char c) { return static_cast<char>(std::tolower(c)); });
+    string_view authority = origin.substr(sep + 3);
+    // Tolerate a single trailing slash (some peers send "https://example.com/" as an Origin); reject any other
+    // path/query/fragment/userinfo.
+    if (!authority.empty() && authority.back() == '/')
+    {
+        authority.remove_suffix(1);
+    }
+    if (authority.empty() || authority.find_first_of("/?#@") != string_view::npos)
+    {
+        throw invalid_argument{"malformed origin '" + string{origin} + "'"};
+    }
+    string hostAndPort{authority};
+    transform(
+        hostAndPort.begin(),
+        hostAndPort.end(),
+        hostAndPort.begin(),
+        [](unsigned char c) { return static_cast<char>(std::tolower(c)); });
+    if (auto colon = hostAndPort.rfind(':'); colon != string::npos)
+    {
+        string_view port = string_view{hostAndPort}.substr(colon + 1);
+        if ((scheme == "http" && port == "80") || (scheme == "https" && port == "443"))
+        {
+            hostAndPort = hostAndPort.substr(0, colon);
+        }
+    }
+    return scheme + "://" + hostAndPort;
+}
+
 NativeInfoPtr
 IceInternal::WSTransceiver::getNativeInfo()
 {
@@ -188,7 +249,7 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer)
                 // encoded with Base64.
                 //
                 vector<byte> key(16);
-                IceInternal::generateRandom(reinterpret_cast<char*>(&key[0]), key.size());
+                IceInternal::generateRandom(reinterpret_cast<char*>(key.data()), key.size());
                 _key = IceInternal::Base64::encode(key);
                 out << _key << "\r\n\r\n"; // EOM
 
@@ -376,10 +437,10 @@ IceInternal::WSTransceiver::closing(bool initiator, exception_ptr reason)
     {
         //
         // If we initiated a close connection but also received a
-        // close connection, we assume we didn't initiated the
-        // connection and we send the close frame now. This is to
+        // close connection, we assume we didn't initiate the
+        // close and we send the close frame now. This is to
         // ensure that if both peers close the connection at the same
-        // time we don't hang having both peer waiting for the close
+        // time we don't hang having both peers waiting for the close
         // frame of the other.
         //
         assert(!initiator);
@@ -531,8 +592,8 @@ IceInternal::WSTransceiver::read(Buffer& buf)
     }
 
     //
-    // If we read the full Ice message, handle it before trying
-    // reading anymore data from the WS connection.
+    // If we read the full Ice message, handle it before trying to
+    // read any more data from the WS connection.
     //
     if (buf.i == buf.b.end())
     {
@@ -845,9 +906,10 @@ IceInternal::WSTransceiver::WSTransceiver(
     //
 }
 
-IceInternal::WSTransceiver::WSTransceiver(ProtocolInstancePtr instance, TransceiverPtr del)
+IceInternal::WSTransceiver::WSTransceiver(ProtocolInstancePtr instance, TransceiverPtr del, set<string> allowedOrigins)
     : _instance(std::move(instance)),
       _delegate(std::move(del)),
+      _allowedOrigins(std::move(allowedOrigins)),
       _incoming(true),
       _state(StateInitializeDelegate),
       _parser(make_shared<HttpParser>()),
@@ -876,6 +938,19 @@ IceInternal::WSTransceiver::handleRequest(Buffer& responseBuffer)
 {
     string val;
 
+    //
+    // The opening handshake must be a GET request (RFC 6455 section 4.1). We check the message type first
+    // because method() (used just below) and uri() (used later) assert the parser holds a request.
+    //
+    if (_parser->type() != HttpParser::TypeRequest)
+    {
+        throw WebSocketException("WebSocket handshake is not an HTTP request");
+    }
+    if (_parser->method() != "GET")
+    {
+        throw WebSocketException("unsupported HTTP method '" + _parser->method() + "' for WebSocket handshake");
+    }
+
     //
     // HTTP/1.1
     //
@@ -905,7 +980,7 @@ IceInternal::WSTransceiver::handleRequest(Buffer& responseBuffer)
     {
         throw WebSocketException("missing value for Connection field");
     }
-    else if (val.find("upgrade") == string::npos)
+    else if (!hasUpgradeToken(val))
     {
         throw WebSocketException("invalid value '" + val + "' for Connection field");
     }
@@ -955,10 +1030,43 @@ IceInternal::WSTransceiver::handleRequest(Buffer& responseBuffer)
         throw WebSocketException("missing value for WebSocket key");
     }
 
-    vector<byte> decodedKey = Base64::decode(key);
-    if (decodedKey.size() != 16)
+    try
+    {
+        vector<byte> decodedKey = Base64::decode(key);
+        if (decodedKey.size() != 16)
+        {
+            throw WebSocketException("WebSocket key '" + key + "' has invalid length");
+        }
+    }
+    catch (const std::invalid_argument&)
+    {
+        throw WebSocketException("invalid base64 value '" + key + "' for WebSocket key");
+    }
+
+    //
+    // Optionally validate the Origin header against the adapter's allowed-origins list.
+    // Browsers always send Origin; non-browser clients do not, so an absent header bypasses the check.
+    // A wildcard ("*") allowlist is normalized to an empty set at parse time, so empty here means "no enforcement".
+    //
+    if (!_allowedOrigins.empty())
     {
-        throw WebSocketException("invalid value '" + key + "' for WebSocket key");
+        string origin;
+        if (_parser->getHeader("Origin", origin, false))
+        {
+            string canonical;
+            try
+            {
+                canonical = canonicalizeOrigin(IceInternal::trim(origin));
+            }
+            catch (const std::invalid_argument&)
+            {
+                throw WebSocketException("invalid Origin header '" + origin + "'");
+            }
+            if (_allowedOrigins.count(canonical) == 0)
+            {
+                throw WebSocketException("origin '" + origin + "' is not allowed");
+            }
+        }
     }
 
     //
@@ -991,9 +1099,8 @@ IceInternal::WSTransceiver::handleRequest(Buffer& responseBuffer)
     out << "Sec-WebSocket-Accept: ";
     string input = key + _wsUUID;
     vector<byte> hash;
-    sha1(reinterpret_cast<const byte*>(&input[0]), input.size(), hash);
-    out << IceInternal::Base64::encode(hash) << "\r\n"
-        << "\r\n"; // EOM
+    sha1(reinterpret_cast<const byte*>(input.data()), input.size(), hash);
+    out << IceInternal::Base64::encode(hash) << "\r\n\r\n"; // EOM
 
     string str = out.str();
     responseBuffer.b.resize(str.size());
@@ -1058,7 +1165,7 @@ IceInternal::WSTransceiver::handleResponse()
     {
         throw WebSocketException("missing value for Connection field");
     }
-    else if (val.find("upgrade") == string::npos)
+    else if (!hasUpgradeToken(val))
     {
         throw WebSocketException("invalid value '" + val + "' for Connection field");
     }
@@ -1090,7 +1197,7 @@ IceInternal::WSTransceiver::handleResponse()
     }
     string input = _key + _wsUUID;
     vector<byte> hash;
-    sha1(reinterpret_cast<const byte*>(&input[0]), input.size(), hash);
+    sha1(reinterpret_cast<const byte*>(input.data()), input.size(), hash);
     if (val != IceInternal::Base64::encode(hash))
     {
         throw WebSocketException("invalid value '" + val + "' for Sec-WebSocket-Accept");
@@ -1120,6 +1227,16 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
             byte ch = *_readI++;
             _readOpCode = static_cast<int>(ch & byte{0xf});
 
+            //
+            // No extension is negotiated, so the RSV1, RSV2, and RSV3 bits must all be 0.
+            //
+            if ((ch & byte{0x70}) != byte{0})
+            {
+                throw ProtocolException(__FILE__, __LINE__, "invalid WebSocket frame: RSV bits must be 0");
+            }
+
+            const bool finalFrame = (ch & byte{FLAG_FINAL}) == byte{FLAG_FINAL};
+
             //
             // Remember if last frame if we're going to read a data or
             // continuation frame, this is only for protocol
@@ -1131,7 +1248,7 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
                 {
                     throw ProtocolException(__FILE__, __LINE__, "invalid data frame, no FIN on previous frame");
                 }
-                _readLastFrame = (ch & byte{FLAG_FINAL}) == byte{FLAG_FINAL};
+                _readLastFrame = finalFrame;
             }
             else if (_readOpCode == OP_CONT)
             {
@@ -1139,7 +1256,7 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
                 {
                     throw ProtocolException(__FILE__, __LINE__, "invalid continuation frame, previous frame FIN set");
                 }
-                _readLastFrame = (ch & byte{FLAG_FINAL}) == byte{FLAG_FINAL};
+                _readLastFrame = finalFrame;
             }
 
             ch = *_readI++;
@@ -1162,6 +1279,30 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
             // 127:   The subsequent eight bytes contain the payload length
             //
             _readPayloadLength = static_cast<size_t>((ch & byte{0x7f}));
+
+            //
+            // RFC 6455 section 5.5: control frames (close, ping, and pong) must not be fragmented
+            // and must have a payload length of 125 bytes or less - they cannot use the 16-bit or
+            // 64-bit extended length encoding. Enforce this before allocating any payload buffer.
+            //
+            if (_readOpCode == OP_CLOSE || _readOpCode == OP_PING || _readOpCode == OP_PONG)
+            {
+                if (!finalFrame)
+                {
+                    throw ProtocolException(
+                        __FILE__,
+                        __LINE__,
+                        "invalid WebSocket control frame: the FIN bit is not set");
+                }
+                if (_readPayloadLength > 125)
+                {
+                    throw ProtocolException(
+                        __FILE__,
+                        __LINE__,
+                        "invalid WebSocket control frame: the payload length exceeds 125 bytes");
+                }
+            }
+
             if (_readPayloadLength < 126)
             {
                 _readHeaderLength = 0;
@@ -1194,7 +1335,10 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
 
             if (_readPayloadLength == 126)
             {
-                _readPayloadLength = static_cast<size_t>(ntohs(*reinterpret_cast<uint16_t*>(_readI)));
+                // memcpy avoids the alignment UB of a direct uint16_t* dereference on _readI.
+                uint16_t length;
+                memcpy(&length, _readI, sizeof(length));
+                _readPayloadLength = static_cast<size_t>(ntohs(length));
                 _readI += 2;
             }
             else if (_readPayloadLength == 127)
@@ -1244,7 +1388,7 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
                     }
                     _readState = ReadStatePayload;
                     assert(buf.i != buf.b.end());
-                    _readFrameStart = buf.i;
+                    _readFrameOffset = 0;
                     break;
                 }
                 case OP_CLOSE: // Connection close
@@ -1322,7 +1466,17 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
             {
                 _pingPayload.clear();
                 _pingPayload.resize(_readPayloadLength);
-                memcpy(&_pingPayload[0], _readI, _pingPayload.size());
+                memcpy(_pingPayload.data(), _readI, _pingPayload.size());
+                if (_incoming)
+                {
+                    // A client masks its frames (RFC 6455 §5.3), so unmask the ping payload here, just like the
+                    // data path does in postRead. Otherwise the pong we echo back carries the still-masked bytes
+                    // instead of the original ping payload (RFC 6455 §5.5.3).
+                    for (size_t i = 0; i < _pingPayload.size(); ++i)
+                    {
+                        _pingPayload[i] ^= static_cast<uint8_t>(_readMask[i % 4]);
+                    }
+                }
             }
 
             _readI += _readPayloadLength;
@@ -1398,13 +1552,16 @@ IceInternal::WSTransceiver::postRead(Buffer& buf)
     if (_incoming)
     {
         //
-        // Unmask the data we just read.
+        // Unmask the data we just read. _readFrameOffset is the mask index (payload bytes consumed so far in
+        // this frame). We keep it as an integer rather than an iterator into buf because ConnectionI reallocates
+        // the read buffer between reads of the same frame, which would invalidate such an iterator.
         //
         IceInternal::Buffer::Container::iterator p = _readStart;
-        for (auto n = static_cast<size_t>(_readStart - _readFrameStart); p < buf.i; ++p, ++n)
+        for (size_t n = _readFrameOffset; p < buf.i; ++p, ++n)
         {
             *p ^= _readMask[n % 4];
         }
+        _readFrameOffset += static_cast<size_t>(buf.i - _readStart);
     }
 
     _readPayloadLength -= static_cast<size_t>(buf.i - _readStart);
@@ -1447,15 +1604,35 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
         else if (_state == StatePongPending)
         {
             prepareWriteHeader(OP_PONG, _pingPayload.size());
-            if (_pingPayload.size() > static_cast<size_t>(_writeBuffer.b.end() - _writeBuffer.i))
+
+            // A zero-length ping (the common keep-alive case) leaves _pingPayload empty. Guard the copy so we
+            // never form &_pingPayload[0] on an empty vector, which is undefined behavior and aborts under
+            // hardened standard libraries (_GLIBCXX_ASSERTIONS, MSVC debug iterators, libc++ hardening).
+            if (!_pingPayload.empty())
             {
-                auto pos = static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin());
-                _writeBuffer.b.resize(pos + _pingPayload.size());
-                _writeBuffer.i = _writeBuffer.b.begin() + pos;
+                if (_pingPayload.size() > static_cast<size_t>(_writeBuffer.b.end() - _writeBuffer.i))
+                {
+                    auto pos = static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin());
+                    _writeBuffer.b.resize(pos + _pingPayload.size());
+                    _writeBuffer.i = _writeBuffer.b.begin() + pos;
+                }
+                if (_incoming)
+                {
+                    // Server-to-client frames are not masked (RFC 6455 §5.1).
+                    memcpy(_writeBuffer.i, _pingPayload.data(), _pingPayload.size());
+                    _writeBuffer.i += _pingPayload.size();
+                }
+                else
+                {
+                    // Client-to-server frames are masked with _writeMask, like the OP_DATA and OP_CLOSE paths;
+                    // prepareWriteHeader set FLAG_MASKED, so the payload must be masked to match (RFC 6455 §5.5.3).
+                    for (size_t i = 0; i < _pingPayload.size(); ++i)
+                    {
+                        *_writeBuffer.i++ = static_cast<std::byte>(_pingPayload[i]) ^ _writeMask[i % 4];
+                    }
+                }
+                _pingPayload.clear();
             }
-            memcpy(_writeBuffer.i, &_pingPayload[0], _pingPayload.size());
-            _writeBuffer.i += _pingPayload.size();
-            _pingPayload.clear();
 
             _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             _writeState = WriteStateControlFrame;
@@ -1467,8 +1644,9 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
         {
             prepareWriteHeader(OP_CLOSE, 2);
 
-            // Write closing reason
-            *reinterpret_cast<uint16_t*>(_writeBuffer.i) = htons(static_cast<uint16_t>(_closingReason));
+            // Write closing reason. memcpy avoids the alignment UB of a direct uint16_t* store.
+            const uint16_t reason = htons(static_cast<uint16_t>(_closingReason));
+            memcpy(_writeBuffer.i, &reason, sizeof(reason));
             if (!_incoming)
             {
                 *_writeBuffer.i++ ^= _writeMask[0];
@@ -1499,7 +1677,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
         // 32-bit value, so we copy the entire message into the internal buffer
         // for writing. For incoming connections, we just copy the start of the
         // message in the internal buffer after the header. If the message is
-        // larger, the reminder is sent directly from the message buffer to avoid
+        // larger, the remainder is sent directly from the message buffer to avoid
         // copying.
         //
 
@@ -1688,7 +1866,9 @@ IceInternal::WSTransceiver::prepareWriteHeader(uint8_t opCode, IceInternal::Buff
         // Use an extra 16 bits to encode the payload length.
         //
         *_writeBuffer.i++ = byte{126};
-        *reinterpret_cast<uint16_t*>(_writeBuffer.i) = htons(static_cast<uint16_t>(payloadLength));
+        // memcpy avoids the alignment UB of a direct uint16_t* store.
+        const uint16_t length = htons(static_cast<uint16_t>(payloadLength));
+        memcpy(_writeBuffer.i, &length, sizeof(length));
         _writeBuffer.i += 2;
     }
     else if (payloadLength > USHRT_MAX)

data/dist/ice/cpp/src/Ice/WSTransceiver.h

@@ -10,16 +10,26 @@
 #include "ProtocolInstance.h"
 #include "Transceiver.h"
 
+#include <set>
+#include <string>
+#include <string_view>
+
 namespace IceInternal
 {
     class ConnectorI;
     class AcceptorI;
 
+    // Canonicalize an origin string: lowercase scheme and host, omit the default port (80 for http, 443 for https).
+    // A single trailing slash is tolerated. Throws std::invalid_argument if the input is not a syntactically valid
+    // origin per RFC 6454 -- "scheme://host[:port]" with no path beyond a trailing slash, no query, fragment, or
+    // userinfo.
+    std::string canonicalizeOrigin(std::string_view origin);
+
     class WSTransceiver final : public Transceiver
     {
     public:
         WSTransceiver(ProtocolInstancePtr, TransceiverPtr, std::string, std::string);
-        WSTransceiver(ProtocolInstancePtr, TransceiverPtr);
+        WSTransceiver(ProtocolInstancePtr, TransceiverPtr, std::set<std::string> allowedOrigins);
         ~WSTransceiver();
 
         NativeInfoPtr getNativeInfo() final;
@@ -66,6 +76,7 @@ namespace IceInternal
         const TransceiverPtr _delegate;
         const std::string _host;
         const std::string _resource;
+        const std::set<std::string> _allowedOrigins;
         const bool _incoming;
 
         enum State
@@ -106,7 +117,7 @@ namespace IceInternal
         size_t _readHeaderLength;
         size_t _readPayloadLength;
         Buffer::Container::iterator _readStart;
-        Buffer::Container::iterator _readFrameStart;
+        size_t _readFrameOffset{0};
         std::byte _readMask[4];
 
         enum WriteState

data/dist/ice/cpp/src/Ice/generated/BuiltinSequences.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.1
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'BuiltinSequences.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/Context.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.1
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'Context.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/EndpointTypes.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.1
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'EndpointTypes.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/Identity.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.1
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'Identity.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/Locator.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.1
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'Locator.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/LocatorRegistry.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.1
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'LocatorRegistry.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/Metrics.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.1
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'Metrics.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/OperationMode.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.1
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'OperationMode.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/Process.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.1
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'Process.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/PropertiesAdmin.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.1
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'PropertiesAdmin.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -33,7 +33,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/src/Ice/generated/PropertyDict.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.1
+// slice2cpp version 3.8.3
 // <auto-generated>Generated from Slice file 'PropertyDict.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif