On Thu, Jun 29, 2023 at 11:30:10AM +0200, Theo Buehler wrote:
> On Thu, Jun 29, 2023 at 11:25:20AM +0200, Theo Buehler wrote:
> > On Thu, Jun 29, 2023 at 10:54:10AM +0200, Theo Buehler wrote:
> > > On Thu, Jun 29, 2023 at 09:23:53AM +0100, Stuart Henderson wrote:
> > > > Does the same happen if you build your own kernel rather than using a
> > > > snap?
> > >
> > > Someone will have to port the patches that add _CET_ENDBR from
> > > security/boringssl/head to security/rust-ring.
> >
> > Something like this should do the trick. Can't test it. Build and
> > install rust-ring with this patch, then build and install ncspot.
>
> Ugh hold on. I missed something.
This one at least compiles.
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/rust-ring/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 12 Apr 2023 18:43:01 -0000 1.10
+++ Makefile 29 Jun 2023 09:22:34 -0000
@@ -4,7 +4,7 @@ COMMENT = ring crate source patched for
VERSION = 0.16.20
DISTNAME = ring-${VERSION}
PKGNAME = rust-${DISTNAME}
-REVISION = 6
+REVISION = 7
SUBST_VARS = VERSION
Index: patches/patch-pregenerated_aesni-gcm-x86_64-elf_S
===================================================================
RCS file: /cvs/ports/security/rust-ring/patches/patch-pregenerated_aesni-gcm-x86_64-elf_S,v
retrieving revision 1.2
diff -u -p -r1.2 patch-pregenerated_aesni-gcm-x86_64-elf_S
--- patches/patch-pregenerated_aesni-gcm-x86_64-elf_S 24 Feb 2023 08:09:50 -0000 1.2
+++ patches/patch-pregenerated_aesni-gcm-x86_64-elf_S 29 Jun 2023 09:36:56 -0000
@@ -1,7 +1,36 @@
Index: pregenerated/aesni-gcm-x86_64-elf.S
--- pregenerated/aesni-gcm-x86_64-elf.S.orig
+++ pregenerated/aesni-gcm-x86_64-elf.S
-@@ -827,6 +827,7 @@ GFp_aesni_gcm_encrypt:
+@@ -1,6 +1,12 @@
+ # This file is generated from a similarly-named Perl script in the BoringSSL
+ # source tree. Do not edit by hand.
+
++#if defined(__CET__)
++#include <cet.h>
++#else
++#define _CET_ENDBR
++
No comments:
Post a Comment