Merge pull request #532 from dongbeiouba/fix83/CVE-2023-4807

Fix CVE-2023-4807
Tongsuo-Project · Dec 4, 2023 · cd776f8 · cd776f8
2 parents 6a4ad4d + e43a412
commit cd776f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -7,7 +7,7 @@
 
  Changes between 8.3.3 and 8.3.4 [xxxx年xx月xx日]
 
-  *)
+  *) 修复CVE-2023-4807
 
  Changes between 8.3.2 and 8.3.3 [2023年08月28日]
 

diff --git a/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/poly1305/asm/poly1305-x86_64.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -193,7 +193,7 @@ sub poly1305_iteration {
 	bt	\$`5+32`,%r9		# AVX2?
 	cmovc	%rax,%r10
 ___
-$code.=<<___	if ($avx>3);
+$code.=<<___	if ($avx>3 && !$win64);
 	mov	\$`(1<<31|1<<21|1<<16)`,%rax
 	shr	\$32,%r9
 	and	%rax,%r9
@@ -2722,7 +2722,7 @@ sub poly1305_iteration {
 .cfi_endproc
 .size	poly1305_blocks_avx512,.-poly1305_blocks_avx512
 ___
-if ($avx>3) {
+if ($avx>3 && !$win64) {
 ########################################################################
 # VPMADD52 version using 2^44 radix.
 #
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
      Changes between 8.3.3 and 8.3.4 [xxxx年xx月xx日]
-      *)
+      *) 修复CVE-2023-4807
      Changes between 8.3.2 and 8.3.3 [2023年08月28日]
@@ Expand Down @@