From: Mark Kettenis <mark.kettenis@xs4all.nl>
Subject: security/openssl/3.2 endbr64 sprinkling
To: tb@openbsd.org
Cc: ports@openbsd.org
Date: Sun, 18 Feb 2024 23:28:37 +0100

ok?

Index: security/openssl/3.2/Makefile
===================================================================
RCS file: /cvs/ports/security/openssl/3.2/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- security/openssl/3.2/Makefile	30 Jan 2024 23:24:27 -0000	1.4
+++ security/openssl/3.2/Makefile	18 Feb 2024 22:27:46 -0000
@@ -8,6 +8,7 @@ V=		3.2.1
 PKGNAME=	openssl-${V}
 PKGSPEC=	openssl->=3.2v0,<3.3v0
 EPOCH=		0
+REVISION=	0
 
 SHLIBVER=	22.0
 SHARED_LIBS=	crypto ${SHLIBVER} \
Index: security/openssl/3.2/patches/patch-crypto_modes_asm_ghash-x86_64_pl
===================================================================
RCS file: /cvs/ports/security/openssl/3.2/patches/patch-crypto_modes_asm_ghash-x86_64_pl,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-crypto_modes_asm_ghash-x86_64_pl
--- security/openssl/3.2/patches/patch-crypto_modes_asm_ghash-x86_64_pl	29 Nov 2023 12:44:58 -0000	1.1.1.1
+++ security/openssl/3.2/patches/patch-crypto_modes_asm_ghash-x86_64_pl	18 Feb 2024 22:27:46 -0000
@@ -1,7 +1,23 @@
 Index: crypto/modes/asm/ghash-x86_64.pl
 --- crypto/modes/asm/ghash-x86_64.pl.orig
 +++ crypto/modes/asm/ghash-x86_64.pl
-@@ -1609,6 +1609,7 @@ ___
+@@ -534,6 +534,7 @@ $code.=<<___;
+ .align	16
+ gcm_init_clmul:
+ .cfi_startproc
++	endbranch
+ .L_init_clmul:
+ ___
+ $code.=<<___ if ($win64);
+@@ -1027,6 +1028,7 @@ $code.=<<___;
+ .align	32
+ gcm_init_avx:
+ .cfi_startproc
++	endbranch
+ ___
+ if ($avx) {
+ my ($Htbl,$Xip)=@_4args;
+@@ -1609,6 +1611,7 @@ ___
  }
  ␌
  $code.=<<___;
@@ -9,7 +25,7 @@ Index: crypto/modes/asm/ghash-x86_64.pl
  .align	64
  .Lbswap_mask:
  	.byte	15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -1662,6 +1663,7 @@ $code.=<<___;
+@@ -1662,6 +1665,7 @@ $code.=<<___;
  
  .asciz	"GHASH for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
  .align	64
Index: security/openssl/3.2/patches/patch-crypto_poly1305_asm_poly1305-x86_64_pl
===================================================================
RCS file: /cvs/ports/security/openssl/3.2/patches/patch-crypto_poly1305_asm_poly1305-x86_64_pl,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-crypto_poly1305_asm_poly1305-x86_64_pl
--- security/openssl/3.2/patches/patch-crypto_poly1305_asm_poly1305-x86_64_pl	29 Nov 2023 12:44:58 -0000	1.1.1.1
+++ security/openssl/3.2/patches/patch-crypto_poly1305_asm_poly1305-x86_64_pl	18 Feb 2024 22:27:46 -0000
@@ -1,7 +1,55 @@
 Index: crypto/poly1305/asm/poly1305-x86_64.pl
 --- crypto/poly1305/asm/poly1305-x86_64.pl.orig
 +++ crypto/poly1305/asm/poly1305-x86_64.pl
-@@ -3778,6 +3778,7 @@ poly1305_emit_base2_44:
+@@ -229,6 +229,7 @@ $code.=<<___;
+ .align	32
+ poly1305_blocks:
+ .cfi_startproc
++	endbranch
+ .Lblocks:
+ 	shr	\$4,$len
+ 	jz	.Lno_data		# too short
+@@ -303,6 +304,7 @@ $code.=<<___;
+ .align	32
+ poly1305_emit:
+ .cfi_startproc
++	endbranch
+ .Lemit:
+ 	mov	0($ctx),%r8	# load hash value
+ 	mov	8($ctx),%r9
+@@ -524,6 +526,7 @@ __poly1305_init_avx:
+ .align	32
+ poly1305_blocks_avx:
+ .cfi_startproc
++	endbranch
+ 	mov	20($ctx),%r8d		# is_base2_26
+ 	cmp	\$128,$len
+ 	jae	.Lblocks_avx
+@@ -1384,6 +1387,7 @@ $code.=<<___;
+ .align	32
+ poly1305_emit_avx:
+ .cfi_startproc
++	endbranch
+ 	cmpl	\$0,20($ctx)	# is_base2_26?
+ 	je	.Lemit
+ 
+@@ -1448,6 +1452,7 @@ $code.=<<___;
+ .align	32
+ poly1305_blocks_avx2:
+ .cfi_startproc
++	endbranch
+ 	mov	20($ctx),%r8d		# is_base2_26
+ 	cmp	\$128,$len
+ 	jae	.Lblocks_avx2
+@@ -2144,6 +2149,7 @@ $code.=<<___;
+ .align	32
+ poly1305_blocks_avx512:
+ .cfi_startproc
++	endbranch
+ .Lblocks_avx512:
+ 	mov		\$15,%eax
+ 	kmovw		%eax,%k2
+@@ -3778,6 +3784,7 @@ poly1305_emit_base2_44:
  ___
  }	}	}
  $code.=<<___;
@@ -9,7 +57,7 @@ Index: crypto/poly1305/asm/poly1305-x86_
  .align	64
  .Lconst:
  .Lmask24:
-@@ -3809,6 +3810,7 @@ $code.=<<___;
+@@ -3809,6 +3816,7 @@ $code.=<<___;
  .Lx_mask42:
  .quad	0x3ffffffffff,0x3ffffffffff,0x3ffffffffff,0x3ffffffffff
  .quad	0x3ffffffffff,0x3ffffffffff,0x3ffffffffff,0x3ffffffffff