crypto: fix undefined behavior in ParseExtension

Many extensions are unknown to the `ClientHelloParser::ParseExtension`, do not cast user-supplied `uint16_t` to `enum`. PR-URL: #7494 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
nodejs · Aug 10, 2016 · 5f3ab3f · 5f3ab3f
1 parent 98f51ff
commit 5f3ab3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/node_crypto_clienthello.cc b/src/node_crypto_clienthello.cc
@@ -103,7 +103,7 @@ void ClientHelloParser::ParseHeader(const uint8_t* data, size_t avail) {
 }
 
 
-void ClientHelloParser::ParseExtension(ClientHelloParser::ExtensionType type,
+void ClientHelloParser::ParseExtension(const uint16_t type,
                                        const uint8_t* data,
                                        size_t len) {
   // NOTE: In case of anything we're just returning back, ignoring the problem.
@@ -210,7 +210,7 @@ bool ClientHelloParser::ParseTLSClientHello(const uint8_t* data, size_t avail) {
     if (ext_off + ext_len > avail)
       return false;
 
-    ParseExtension(static_cast<ExtensionType>(ext_type),
+    ParseExtension(ext_type,
                    data + ext_off,
                    ext_len);
 

diff --git a/src/node_crypto_clienthello.h b/src/node_crypto_clienthello.h
@@ -91,7 +91,7 @@ class ClientHelloParser {
 
   bool ParseRecordHeader(const uint8_t* data, size_t avail);
   void ParseHeader(const uint8_t* data, size_t avail);
-  void ParseExtension(ExtensionType type,
+  void ParseExtension(const uint16_t type,
                       const uint8_t* data,
                       size_t len);
   bool ParseTLSClientHello(const uint8_t* data, size_t avail);