Skip unsupported group check on post-quantum exchange agreements

Author: wqweto

contrib/cHttpRequest.cls

@@ -1742,7 +1742,7 @@ Private Function pvToStringAndFree(ByVal lPtr As Long) As Variant
     End If
 End Function
 
-Public Function SetCookie(ByVal sDomain As String, ByVal sPath As String, ByVal sValue As String)
+Public Sub SetCookie(ByVal sDomain As String, ByVal sPath As String, ByVal sValue As String)
     Dim oCol            As Collection
 
     If Left$(sDomain, 1) = "." Then
@@ -1767,7 +1767,7 @@ Public Function SetCookie(ByVal sDomain As String, ByVal sPath As String, ByVal
         Set m_oCookies.Item(sDomain) = oCol
     End If
     oCol.Add sPath & Chr$(1) & sValue
-End Function
+End Sub
 
 Private Function pvGetAllCookies(ByVal sDomain As String, ByVal sPath As String) As String
     Dim vRetVal         As Variant

src/mdTlsThunks.bas

@@ -3018,26 +3018,25 @@ Private Function pvTlsParseHandshakeClientHello(uCtx As UcsTlsContext, uInput As
                                         If .HelloRetryRequest And lExchGroup <> .HelloRetryExchGroup Then
                                             lExchGroup = 0
                                         End If
+                                        eExchAlgo = 0
                                         Select Case lExchGroup
                                         Case TLS_GROUP_X25519
                                             eExchAlgo = ucsTlsAlgoExchX25519
                                         Case TLS_GROUP_SECP256R1
                                             eExchAlgo = ucsTlsAlgoExchSecp256r1
                                         Case TLS_GROUP_SECP384R1
                                             eExchAlgo = ucsTlsAlgoExchSecp384r1
-                                        Case TLS_GROUP_X448, TLS_GROUP_SECP521R1
-                                            eExchAlgo = 0
+                                        Case TLS_GROUP_SECP521R1, TLS_GROUP_X448
+                                            '--- unsupported ecc curves
                                         Case TLS_GROUP_FFDHE_FIRST To TLS_GROUP_FFDHE_LAST
-                                            eExchAlgo = 0
-                                        Case TLS_GROUP_FFDHE_PRIVATE_USE_FIRST To TLS_GROUP_FFDHE_PRIVATE_USE_LAST
-                                            eExchAlgo = 0
-                                        Case TLS_GROUP_ECDHE_PRIVATE_USE_FIRST To TLS_GROUP_ECDHE_PRIVATE_USE_LAST
-                                            eExchAlgo = 0
+                                            '--- ffdhe
+                                        Case TLS_GROUP_FFDHE_PRIVATE_USE_FIRST To TLS_GROUP_FFDHE_PRIVATE_USE_LAST, TLS_GROUP_ECDHE_PRIVATE_USE_FIRST To TLS_GROUP_ECDHE_PRIVATE_USE_LAST
+                                            '--- private use
                                         Case Else
                                             If (lExchGroup And &HFF) = lExchGroup \ &H100 And (lExchGroup And &HF) = &HA Then
-                                                eExchAlgo = 0 '--- grease from RFC8701
+                                                '--- grease from RFC8701
                                             Else
-                                                GoTo UnsupportedExchGroup
+                                                'GoTo UnsupportedExchGroup
                                             End If
                                         End Select
                                         Select Case True
@@ -3106,7 +3105,7 @@ Private Function pvTlsParseHandshakeClientHello(uCtx As UcsTlsContext, uInput As
                                             If (lExchGroup And &HFF) = lExchGroup \ &H100 And (lExchGroup And &HF) = &HA Then
                                                 '--- grease from RFC8701
                                             Else
-                                                GoTo UnsupportedExchGroup
+                                                'GoTo UnsupportedExchGroup
                                             End If
                                         End Select
                                     End If