Merge pull request #563 from InfoHunter/8.4-stable

Resolve X25519 handshake problem
Tongsuo-Project · Jan 12, 2024 · 9bd7614 · 9bd7614
2 parents cd2f2d9 + 06dc472
commit 9bd7614
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -4,7 +4,7 @@
 
  Changes between 8.4.0 and 8.4.1 [xx XXX xxxx]
 
-  *)
+  *) 修复TLS1.3中X25519握手失败问题
 
  Changes between 8.3.0 and 8.4.0 [15 Dec 2023]
 

diff --git a/crypto/evp/ctrl_params_translate.c b/crypto/evp/ctrl_params_translate.c
@@ -2307,8 +2307,12 @@ static const struct translation_st evp_pkey_ctx_translations[] = {
      */
     { SET, EVP_PKEY_X25519, EVP_PKEY_X25519, EVP_PKEY_OP_KEYGEN, -1, NULL, NULL,
       OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
+    { SET, EVP_PKEY_X25519, EVP_PKEY_X25519, EVP_PKEY_OP_PARAMGEN, -1, NULL, NULL,
+      OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
     { SET, EVP_PKEY_X448, EVP_PKEY_X448, EVP_PKEY_OP_KEYGEN, -1, NULL, NULL,
       OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
+    { SET, EVP_PKEY_X448, EVP_PKEY_X448, EVP_PKEY_OP_PARAMGEN, -1, NULL, NULL,
+      OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
 };
 
 static const struct translation_st evp_pkey_translations[] = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
      Changes between 8.4.0 and 8.4.1 [xx XXX xxxx]
-      *)
+      *) 修复TLS1.3中X25519握手失败问题
      Changes between 8.3.0 and 8.4.0 [15 Dec 2023]
@@ Expand Down @@