Skip to content

Commit

Permalink
Fix SSL 2 version constant to 0x0002
Browse files Browse the repository at this point in the history
SSL 2 uses a version field of 0x0002, not 0x0200.  This is confirmed not
only in the original Netscape spec [1] and RFC draft of the time [2],
but also in major implementations such as OpenSSL [3] and Wireshark [4].

[1] https://www-archive.mozilla.org/projects/security/pki/nss/ssl/draft02.html
[2] https://datatracker.ietf.org/doc/html/draft-hickman-netscape-ssl-00
[3] https://github.com/openssl/openssl/blob/OpenSSL_0_9_6m/ssl/ssl2.h#L66-L71
[4] https://github.com/wireshark/wireshark/blob/release-4.4/epan/dissectors/packet-tls-utils.h#L266-L277
  • Loading branch information
droe committed Jan 19, 2025
1 parent bc5c08d commit 426070b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Packet++/header/SSLCommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ namespace pcpp
enum SSLVersionEnum
{
/** SSL 2.0 */
SSL2 = 0x0200,
SSL2 = 0x0002,
/** SSL 3.0 */
SSL3 = 0x0300,
/** TLS 1.0 */
Expand Down
5 changes: 1 addition & 4 deletions Packet++/src/SSLCommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace pcpp

SSLVersion::SSLVersionEnum SSLVersion::asEnum(bool countTlsDraftsAs1_3)
{
if (m_SSLVersionValue >= 0x0300 && m_SSLVersionValue <= 0x0304)
if ((m_SSLVersionValue >= 0x0300 && m_SSLVersionValue <= 0x0304) || m_SSLVersionValue == 0x0002)
return static_cast<SSLVersion::SSLVersionEnum>(m_SSLVersionValue);

if ((m_SSLVersionValue >= 0x7f0e && m_SSLVersionValue <= 0x7f1c) || m_SSLVersionValue == 0xfb17 ||
Expand All @@ -23,9 +23,6 @@ namespace pcpp
return static_cast<SSLVersion::SSLVersionEnum>(m_SSLVersionValue);
}

if (m_SSLVersionValue == 0x200)
return SSLVersion::SSL2;

return SSLVersion::Unknown;
}

Expand Down

0 comments on commit 426070b

Please sign in to comment.