<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4dbd0a5202f94625aa2008ca3160aa875697817b">https://github.com/macports/macports-ports/commit/4dbd0a5202f94625aa2008ca3160aa875697817b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4dbd0a5202f94625aa2008ca3160aa875697817b
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Tue Aug 1 19:54:01 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> openssl3: Update to 3.1.2
</span>---
devel/openssl3/Portfile | 11 +-
.../52a38144b019cfda6b0e5eaa0aca88ae11661a26.patch | 558 ---------------------
.../d79bb5316e1318bd776d6b2d6723a36778e07f9d.patch | 36 --
3 files changed, 4 insertions(+), 601 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl3/Portfile b/devel/openssl3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dce943ea65c..d9500abae51 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/openssl3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/openssl3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ legacysupport.newest_darwin_requires_legacy 8
</span>
set major_v 3
name openssl$major_v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version ${major_v}.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version ${major_v}.1.2
</span> revision 0
# Please revbump these ports when updating the openssl3 version/revision
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,12 +48,9 @@ master_sites ${homepage}/source \
</span> ftp://ftp.linux.hr/pub/openssl/source/ \
ftp://guest.kuria.katowice.pl/pub/openssl/source/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b88142ed021e735c402ae6f0fb2d49846d9d5b34 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 15544757
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles d79bb5316e1318bd776d6b2d6723a36778e07f9d.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 52a38144b019cfda6b0e5eaa0aca88ae11661a26.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ea6d1349543ca22ea65ad1a520ebd0e51440046d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 15560427
</span>
if {${os.platform} eq "darwin" && ${os.major} < 11} {
# Having the stdlib set to libc++ on 10.6 causes a dependency on a
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl3/files/52a38144b019cfda6b0e5eaa0aca88ae11661a26.patch b/devel/openssl3/files/52a38144b019cfda6b0e5eaa0aca88ae11661a26.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9de08f5622e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/openssl3/files/52a38144b019cfda6b0e5eaa0aca88ae11661a26.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,558 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 52a38144b019cfda6b0e5eaa0aca88ae11661a26 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Tom Cosgrove <tom.cosgrove@arm.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 12 Feb 2023 20:26:23 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Tidy up aarch64 feature detection code in armcap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Make the SIGILL-based code easier to read, and don't use it on Apple Silicon.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Also fix "error: 'HWCAP(2)_*' macro redefined" warnings on FreeBSD.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes #20188
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: I5618bbe9444cc40cb5705c6ccbdc331c16bab794
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Tomas Mraz <tomas@openssl.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Paul Dale <pauli@openssl.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(Merged from https://github.com/openssl/openssl/pull/20305)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Backport [https://github.com/openssl/openssl/commit/52a38144b019cfda6b0e5eaa0aca88ae11661a26]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- crypto/armcap.c | 401 +++++++++++++++++++++++++-----------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 208 insertions(+), 193 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/crypto/armcap.c b/crypto/armcap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 01b3b32534f2..03bc659bdbd2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./crypto/armcap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./crypto/armcap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * Copyright 2011-2022 The OpenSSL Project Authors. All Rights Reserved.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Copyright 2011-2023 The OpenSSL Project Authors. All Rights Reserved.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Licensed under the Apache License 2.0 (the "License"). You may not use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * this file except in compliance with the License. You can obtain a copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,17 +10,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <setjmp.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <signal.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <openssl/crypto.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/sysctl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <setjmp.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <signal.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "internal/cryptlib.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <windows.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "arm_arch.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,7 +47,7 @@ uint32_t OPENSSL_rdtsc(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif __ARM_MAX_ARCH__<7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif __ARM_MAX_ARCH__ < 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void OPENSSL_cpuid_setup(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,73 +56,11 @@ uint32_t OPENSSL_rdtsc(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static sigset_t all_masked;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static sigjmp_buf ill_jmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static void ill_handler(int sig)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- siglongjmp(ill_jmp, sig);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * Following subroutines could have been inlined, but it's not all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * ARM compilers support inline assembler...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void _armv7_neon_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void _armv8_aes_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void _armv8_sha1_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void _armv8_sha256_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void _armv8_pmull_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifdef __aarch64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void _armv8_sm3_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void _armv8_sm4_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void _armv8_eor3_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void _armv8_sha512_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--unsigned int _armv8_cpuid_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void _armv8_sve_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void _armv8_sve2_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void _armv8_rng_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--size_t OPENSSL_rndr_asm(unsigned char *buf, size_t len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--size_t OPENSSL_rndrrs_asm(unsigned char *buf, size_t len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--size_t OPENSSL_rndr_bytes(unsigned char *buf, size_t len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--size_t OPENSSL_rndrrs_bytes(unsigned char *buf, size_t len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static size_t OPENSSL_rndr_wrapper(size_t (*func)(unsigned char *, size_t), unsigned char *buf, size_t len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- size_t buffer_size = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (i = 0; i < 8; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- buffer_size = func(buf, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (buffer_size == len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- usleep(5000); /* 5000 microseconds (5 milliseconds) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return buffer_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else /* !_WIN32 && __ARM_MAX_ARCH__ >= 7 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--size_t OPENSSL_rndr_bytes(unsigned char *buf, size_t len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return OPENSSL_rndr_wrapper(OPENSSL_rndr_asm, buf, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* 3 ways of handling things here: __APPLE__, getauxval() or SIGILL detect */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--size_t OPENSSL_rndrrs_bytes(unsigned char *buf, size_t len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return OPENSSL_rndr_wrapper(OPENSSL_rndrrs_asm, buf, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--uint32_t _armv7_tick(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--uint32_t OPENSSL_rdtsc(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (OPENSSL_armcap_P & ARMV7_TICK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return _armv7_tick();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* First determine if getauxval() is available (OSSL_IMPLEMENT_GETAUXVAL) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if defined(__GNUC__) && __GNUC__>=2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void OPENSSL_cpuid_setup(void) __attribute__ ((constructor));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -161,10 +100,10 @@ static unsigned long getauxval(unsigned long key)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Android: according to https://developer.android.com/ndk/guides/cpu-features,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * getauxval is supported starting with API level 18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# if defined(__ANDROID__) && defined(__ANDROID_API__) && __ANDROID_API__ >= 18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <sys/auxv.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define OSSL_IMPLEMENT_GETAUXVAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if defined(__ANDROID__) && defined(__ANDROID_API__) && __ANDROID_API__ >= 18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <sys/auxv.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_IMPLEMENT_GETAUXVAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * ARM puts the feature bits for Crypto Extensions in AT_HWCAP2, whereas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -177,40 +116,144 @@ static unsigned long getauxval(unsigned long key)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define AT_HWCAP2 26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if defined(__arm__) || defined (__arm)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP AT_HWCAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_NEON (1 << 12)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CE AT_HWCAP2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CE_AES (1 << 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CE_PMULL (1 << 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CE_SHA1 (1 << 2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CE_SHA256 (1 << 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP AT_HWCAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_NEON (1 << 12)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CE AT_HWCAP2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CE_AES (1 << 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CE_PMULL (1 << 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CE_SHA1 (1 << 2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CE_SHA256 (1 << 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # elif defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP AT_HWCAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_NEON (1 << 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CE HWCAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CE_AES (1 << 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CE_PMULL (1 << 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CE_SHA1 (1 << 5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CE_SHA256 (1 << 6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CPUID (1 << 11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_SHA3 (1 << 17)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CE_SM3 (1 << 18)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CE_SM4 (1 << 19)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_CE_SHA512 (1 << 21)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP_SVE (1 << 22)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* AT_HWCAP2 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP2 26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP2_SVE2 (1 << 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define HWCAP2_RNG (1 << 16)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP AT_HWCAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_NEON (1 << 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CE AT_HWCAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CE_AES (1 << 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CE_PMULL (1 << 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CE_SHA1 (1 << 5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CE_SHA256 (1 << 6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CPUID (1 << 11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_SHA3 (1 << 17)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CE_SM3 (1 << 18)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CE_SM4 (1 << 19)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_CE_SHA512 (1 << 21)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP_SVE (1 << 22)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* AT_HWCAP2 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP2 26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP2_SVE2 (1 << 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSSL_HWCAP2_RNG (1 << 16)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+uint32_t _armv7_tick(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+uint32_t OPENSSL_rdtsc(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (OPENSSL_armcap_P & ARMV7_TICK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _armv7_tick();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifdef __aarch64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+size_t OPENSSL_rndr_asm(unsigned char *buf, size_t len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+size_t OPENSSL_rndrrs_asm(unsigned char *buf, size_t len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+size_t OPENSSL_rndr_bytes(unsigned char *buf, size_t len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+size_t OPENSSL_rndrrs_bytes(unsigned char *buf, size_t len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t OPENSSL_rndr_wrapper(size_t (*func)(unsigned char *, size_t), unsigned char *buf, size_t len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t buffer_size = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (i = 0; i < 8; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buffer_size = func(buf, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (buffer_size == len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ usleep(5000); /* 5000 microseconds (5 milliseconds) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return buffer_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+size_t OPENSSL_rndr_bytes(unsigned char *buf, size_t len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return OPENSSL_rndr_wrapper(OPENSSL_rndr_asm, buf, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+size_t OPENSSL_rndrrs_bytes(unsigned char *buf, size_t len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return OPENSSL_rndr_wrapper(OPENSSL_rndrrs_asm, buf, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if !defined(__APPLE__) && !defined(OSSL_IMPLEMENT_GETAUXVAL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static sigset_t all_masked;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static sigjmp_buf ill_jmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void ill_handler(int sig)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ siglongjmp(ill_jmp, sig);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Following subroutines could have been inlined, but not all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * ARM compilers support inline assembler, and we'd then have to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * worry about the compiler optimising out the detection code...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void _armv7_neon_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void _armv8_aes_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void _armv8_sha1_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void _armv8_sha256_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void _armv8_pmull_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifdef __aarch64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void _armv8_sm3_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void _armv8_sm4_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void _armv8_sha512_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void _armv8_eor3_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void _armv8_sve_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void _armv8_sve2_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void _armv8_rng_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif /* !__APPLE__ && !OSSL_IMPLEMENT_GETAUXVAL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* We only call _armv8_cpuid_probe() if (OPENSSL_armcap_P & ARMV8_CPUID) != 0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+unsigned int _armv8_cpuid_probe(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Checks the specified integer sysctl, returning `value` if it's 1, otherwise returning 0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static unsigned int sysctl_query(const char *name, unsigned int value)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsigned int sys_value = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t len = sizeof(sys_value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (sysctlbyname(name, &sys_value, &len, NULL, 0) == 0 && sys_value == 1) ? value : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif !defined(OSSL_IMPLEMENT_GETAUXVAL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Calls a provided probe function, which may SIGILL. If it doesn't, return `value`, otherwise return 0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static unsigned int arm_probe_for(void (*probe)(void), volatile unsigned int value)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (sigsetjmp(ill_jmp, 1) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* The probe function gave us SIGILL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void OPENSSL_cpuid_setup(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *e;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if !defined(__APPLE__) && !defined(OSSL_IMPLEMENT_GETAUXVAL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct sigaction ill_oact, ill_act;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigset_t oset;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int trigger = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (trigger)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -225,7 +268,7 @@ void OPENSSL_cpuid_setup(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# if !defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if !defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Capability probing by catching SIGILL appears to be problematic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * on iOS. But since Apple universe is "monocultural", it's actually
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,78 +278,82 @@ void OPENSSL_cpuid_setup(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P = ARMV7_NEON;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * One could do same even for __aarch64__ iOS builds. It's not done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * exclusively for reasons of keeping code unified across platforms.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * Unified code works because it never triggers SIGILL on Apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * devices...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- unsigned int feature;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- size_t len = sizeof(feature);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char uarch[64];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sysctlbyname("hw.optional.armv8_2_sha512", &feature, &len, NULL, 0) == 0 && feature == 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV8_SHA512;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- feature = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sysctlbyname("hw.optional.armv8_2_sha3", &feature, &len, NULL, 0) == 0 && feature == 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV8_SHA3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- len = sizeof(uarch);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * From
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * https://github.com/llvm/llvm-project/blob/412237dcd07e5a2afbb1767858262a5f037149a3/llvm/lib/Target/AArch64/AArch64.td#L719
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * all of these have been available on 64-bit Apple Silicon from the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * beginning (the A7).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= ARMV7_NEON | ARMV8_PMULL | ARMV8_AES | ARMV8_SHA1 | ARMV8_SHA256;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* More recent extensions are indicated by sysctls */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= sysctl_query("hw.optional.armv8_2_sha512", ARMV8_SHA512);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= sysctl_query("hw.optional.armv8_2_sha3", ARMV8_SHA3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (OPENSSL_armcap_P & ARMV8_SHA3) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char uarch[64];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t len = sizeof(uarch);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((sysctlbyname("machdep.cpu.brand_string", uarch, &len, NULL, 0) == 0) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ((strncmp(uarch, "Apple M1", 8) == 0) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (strncmp(uarch, "Apple M2", 8) == 0)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (strncmp(uarch, "Apple M2", 8) == 0))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_UNROLL8_EOR3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif /* __aarch64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif defined(OSSL_IMPLEMENT_GETAUXVAL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifdef OSSL_IMPLEMENT_GETAUXVAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (getauxval(HWCAP) & HWCAP_NEON) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- unsigned long hwcap = getauxval(HWCAP_CE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (getauxval(OSSL_HWCAP) & OSSL_HWCAP_NEON) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsigned long hwcap = getauxval(OSSL_HWCAP_CE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV7_NEON;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (hwcap & HWCAP_CE_AES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (hwcap & OSSL_HWCAP_CE_AES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_AES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (hwcap & HWCAP_CE_PMULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (hwcap & OSSL_HWCAP_CE_PMULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_PMULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (hwcap & HWCAP_CE_SHA1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (hwcap & OSSL_HWCAP_CE_SHA1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_SHA1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (hwcap & HWCAP_CE_SHA256)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (hwcap & OSSL_HWCAP_CE_SHA256)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_SHA256;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ifdef __aarch64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (hwcap & HWCAP_CE_SM4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (hwcap & OSSL_HWCAP_CE_SM4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_SM4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (hwcap & HWCAP_CE_SHA512)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (hwcap & OSSL_HWCAP_CE_SHA512)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_SHA512;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (hwcap & HWCAP_CPUID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (hwcap & OSSL_HWCAP_CPUID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_CPUID;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (hwcap & HWCAP_CE_SM3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (hwcap & OSSL_HWCAP_CE_SM3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_SM3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (hwcap & HWCAP_SHA3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (hwcap & OSSL_HWCAP_SHA3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_SHA3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ifdef __aarch64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (getauxval(HWCAP) & HWCAP_SVE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (getauxval(OSSL_HWCAP) & OSSL_HWCAP_SVE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_SVE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (getauxval(HWCAP2) & HWCAP2_SVE2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (getauxval(OSSL_HWCAP2) & OSSL_HWCAP2_SVE2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_SVE2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (getauxval(HWCAP2) & HWCAP2_RNG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (getauxval(OSSL_HWCAP2) & OSSL_HWCAP2_RNG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_RNG;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else /* !__APPLE__ && !OSSL_IMPLEMENT_GETAUXVAL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* If all else fails, do brute force SIGILL-based feature detection */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigfillset(&all_masked);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigdelset(&all_masked, SIGILL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -322,74 +369,42 @@ void OPENSSL_cpuid_setup(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigprocmask(SIG_SETMASK, &ill_act.sa_mask, &oset);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigaction(SIGILL, &ill_act, &ill_oact);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* If we used getauxval, we already have all the values */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifndef OSSL_IMPLEMENT_GETAUXVAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sigsetjmp(ill_jmp, 1) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _armv7_neon_probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV7_NEON;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sigsetjmp(ill_jmp, 1) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _armv8_pmull_probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV8_PMULL | ARMV8_AES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else if (sigsetjmp(ill_jmp, 1) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _armv8_aes_probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV8_AES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sigsetjmp(ill_jmp, 1) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _armv8_sha1_probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV8_SHA1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sigsetjmp(ill_jmp, 1) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _armv8_sha256_probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV8_SHA256;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# if defined(__aarch64__) && !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sigsetjmp(ill_jmp, 1) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _armv8_sm4_probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV8_SM4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= arm_probe_for(_armv7_neon_probe, ARMV7_NEON);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sigsetjmp(ill_jmp, 1) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _armv8_sha512_probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV8_SHA512;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (OPENSSL_armcap_P & ARMV7_NEON) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sigsetjmp(ill_jmp, 1) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _armv8_sm3_probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV8_SM3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= arm_probe_for(_armv8_pmull_probe, ARMV8_PMULL | ARMV8_AES);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!(OPENSSL_armcap_P & ARMV8_AES)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= arm_probe_for(_armv8_aes_probe, ARMV8_AES);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sigsetjmp(ill_jmp, 1) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _armv8_eor3_probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV8_SHA3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifdef __aarch64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sigsetjmp(ill_jmp, 1) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _armv8_sve_probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV8_SVE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sigsetjmp(ill_jmp, 1) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _armv8_sve2_probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV8_SVE2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= arm_probe_for(_armv8_sha1_probe, ARMV8_SHA1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= arm_probe_for(_armv8_sha256_probe, ARMV8_SHA256);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sigsetjmp(ill_jmp, 1) == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _armv8_rng_probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_armcap_P |= ARMV8_RNG;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= arm_probe_for(_armv8_sm3_probe, ARMV8_SM3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= arm_probe_for(_armv8_sm4_probe, ARMV8_SM4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= arm_probe_for(_armv8_sha512_probe, ARMV8_SHA512);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= arm_probe_for(_armv8_eor3_probe, ARMV8_SHA3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifdef __aarch64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= arm_probe_for(_armv8_sve_probe, ARMV8_SVE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= arm_probe_for(_armv8_sve2_probe, ARMV8_SVE2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_armcap_P |= arm_probe_for(_armv8_rng_probe, ARMV8_RNG);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Probing for ARMV7_TICK is known to produce unreliable results,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * so we will only use the feature when the user explicitly enables
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * it with OPENSSL_armcap.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * so we only use the feature when the user explicitly enables it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * with OPENSSL_armcap.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigaction(SIGILL, &ill_oact, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigprocmask(SIG_SETMASK, &oset, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif /* __APPLE__, OSSL_IMPLEMENT_GETAUXVAL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ifdef __aarch64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (OPENSSL_armcap_P & ARMV8_CPUID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_arm_midr = _armv8_cpuid_probe();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -406,4 +421,4 @@ void OPENSSL_cpuid_setup(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_UNROLL8_EOR3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* _WIN32, __ARM_MAX_ARCH__ >= 7 */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl3/files/d79bb5316e1318bd776d6b2d6723a36778e07f9d.patch b/devel/openssl3/files/d79bb5316e1318bd776d6b2d6723a36778e07f9d.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 69fa255c9fd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/openssl3/files/d79bb5316e1318bd776d6b2d6723a36778e07f9d.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 44a62980d836d3e2b8e66244ef1fc3f72aac57b1 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Tom Cosgrove <tom.cosgrove@arm.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 25 Jan 2023 19:34:25 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/2] Enable AES optimisation on Apple Silicon M2-based systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Gives a performance enhancement of 16-38%, similar to the M1.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Tomas Mraz <tomas@openssl.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Hugo Landau <hlandau@openssl.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Paul Dale <pauli@openssl.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(Merged from https://github.com/openssl/openssl/pull/20141)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(cherry picked from commit d79bb5316e1318bd776d6b2d6723a36778e07f9d)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Backport [d79bb5316e1318bd776d6b2d6723a36778e07f9d]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- crypto/armcap.c | 3 ++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/crypto/armcap.c b/crypto/armcap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 71296786c3..68f735baec 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./crypto/armcap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./crypto/armcap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -254,7 +254,8 @@ void OPENSSL_cpuid_setup(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_SHA3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- len = sizeof(uarch);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((sysctlbyname("machdep.cpu.brand_string", uarch, &len, NULL, 0) == 0) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (strncmp(uarch, "Apple M1", 8) == 0))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ((strncmp(uarch, "Apple M1", 8) == 0) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (strncmp(uarch, "Apple M2", 8) == 0)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_armcap_P |= ARMV8_UNROLL8_EOR3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.40.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>