From b691bbfcac89ff4cadab20821c931ce1d672b9c9 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Sat, 28 Mar 2026 13:11:28 +0000 Subject: Include crypto_assembly.h instead of manually ensuring _CET_ENDBR exists. ok kenjiro@ tb@ --- src/lib/libcrypto/md5/md5_amd64_generic.S | 8 ++------ src/lib/libcrypto/sha/sha1_amd64_generic.S | 8 ++------ src/lib/libcrypto/sha/sha1_amd64_shani.S | 8 ++------ src/lib/libcrypto/sha/sha256_amd64_generic.S | 8 ++------ src/lib/libcrypto/sha/sha256_amd64_shani.S | 8 ++------ src/lib/libcrypto/sha/sha512_amd64_generic.S | 8 ++------ 6 files changed, 12 insertions(+), 36 deletions(-) (limited to 'src/lib/libcrypto') diff --git a/src/lib/libcrypto/md5/md5_amd64_generic.S b/src/lib/libcrypto/md5/md5_amd64_generic.S index e282d56ad8..35e6fcdada 100644 --- a/src/lib/libcrypto/md5/md5_amd64_generic.S +++ b/src/lib/libcrypto/md5/md5_amd64_generic.S @@ -1,4 +1,4 @@ -/* $OpenBSD: md5_amd64_generic.S,v 1.1 2025/01/24 13:35:04 jsing Exp $ */ +/* $OpenBSD: md5_amd64_generic.S,v 1.2 2026/03/28 13:11:28 jsing Exp $ */ /* * Copyright (c) 2025 Joel Sing * @@ -15,11 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef __CET__ -#include -#else -#define _CET_ENDBR -#endif +#include "crypto_assembly.h" #define ctx %rdi #define in %rsi diff --git a/src/lib/libcrypto/sha/sha1_amd64_generic.S b/src/lib/libcrypto/sha/sha1_amd64_generic.S index a2088229ec..57709c0a1f 100644 --- a/src/lib/libcrypto/sha/sha1_amd64_generic.S +++ b/src/lib/libcrypto/sha/sha1_amd64_generic.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sha1_amd64_generic.S,v 1.4 2026/01/24 14:20:52 jsing Exp $ */ +/* $OpenBSD: sha1_amd64_generic.S,v 1.5 2026/03/28 13:11:28 jsing Exp $ */ /* * Copyright (c) 2024 Joel Sing * @@ -15,11 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef __CET__ -#include -#else -#define _CET_ENDBR -#endif +#include "crypto_assembly.h" #define ctx %rdi #define in %rsi diff --git a/src/lib/libcrypto/sha/sha1_amd64_shani.S b/src/lib/libcrypto/sha/sha1_amd64_shani.S index e31143887a..7fc5168907 100644 --- a/src/lib/libcrypto/sha/sha1_amd64_shani.S +++ b/src/lib/libcrypto/sha/sha1_amd64_shani.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sha1_amd64_shani.S,v 1.3 2026/01/24 14:20:52 jsing Exp $ */ +/* $OpenBSD: sha1_amd64_shani.S,v 1.4 2026/03/28 13:11:28 jsing Exp $ */ /* * Copyright (c) 2024 Joel Sing * @@ -15,11 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef __CET__ -#include -#else -#define _CET_ENDBR -#endif +#include "crypto_assembly.h" /* * SHA-1 implementation using the Intel SHA extensions: diff --git a/src/lib/libcrypto/sha/sha256_amd64_generic.S b/src/lib/libcrypto/sha/sha256_amd64_generic.S index a860b014f2..52ad974eab 100644 --- a/src/lib/libcrypto/sha/sha256_amd64_generic.S +++ b/src/lib/libcrypto/sha/sha256_amd64_generic.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sha256_amd64_generic.S,v 1.5 2026/01/24 14:20:52 jsing Exp $ */ +/* $OpenBSD: sha256_amd64_generic.S,v 1.6 2026/03/28 13:11:28 jsing Exp $ */ /* * Copyright (c) 2024 Joel Sing * @@ -15,11 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef __CET__ -#include -#else -#define _CET_ENDBR -#endif +#include "crypto_assembly.h" #define ctx %rdi #define in %rsi diff --git a/src/lib/libcrypto/sha/sha256_amd64_shani.S b/src/lib/libcrypto/sha/sha256_amd64_shani.S index b6f32b72cf..d86be5be68 100644 --- a/src/lib/libcrypto/sha/sha256_amd64_shani.S +++ b/src/lib/libcrypto/sha/sha256_amd64_shani.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sha256_amd64_shani.S,v 1.3 2026/01/24 14:20:52 jsing Exp $ */ +/* $OpenBSD: sha256_amd64_shani.S,v 1.4 2026/03/28 13:11:28 jsing Exp $ */ /* * Copyright (c) 2024 Joel Sing * @@ -15,11 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef __CET__ -#include -#else -#define _CET_ENDBR -#endif +#include "crypto_assembly.h" /* * SHA-256 implementation using the Intel SHA extensions: diff --git a/src/lib/libcrypto/sha/sha512_amd64_generic.S b/src/lib/libcrypto/sha/sha512_amd64_generic.S index 052367df07..de759875f4 100644 --- a/src/lib/libcrypto/sha/sha512_amd64_generic.S +++ b/src/lib/libcrypto/sha/sha512_amd64_generic.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sha512_amd64_generic.S,v 1.3 2026/01/24 14:20:52 jsing Exp $ */ +/* $OpenBSD: sha512_amd64_generic.S,v 1.4 2026/03/28 13:11:28 jsing Exp $ */ /* * Copyright (c) 2024 Joel Sing * @@ -15,11 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef __CET__ -#include -#else -#define _CET_ENDBR -#endif +#include "crypto_assembly.h" #define ctx %rdi #define in %rsi -- cgit v1.2.3-55-g6feb