From 2d2b9ed9d4bb339cd858d788039a4b16f0f64a00 Mon Sep 17 00:00:00 2001 From: jsing Date: Fri, 11 Aug 2023 15:27:28 +0000 Subject: [PATCH] Stop including md32_common.h. Now that we're no longer dependent on md32_common.h, stop including it. Remove various defines that only existed for md32_common.h usage. --- lib/libcrypto/sha/sha256.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/lib/libcrypto/sha/sha256.c b/lib/libcrypto/sha/sha256.c index c5f56f13dcf..00c93681142 100644 --- a/lib/libcrypto/sha/sha256.c +++ b/lib/libcrypto/sha/sha256.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sha256.c,v 1.29 2023/08/11 15:25:36 jsing Exp $ */ +/* $OpenBSD: sha256.c,v 1.30 2023/08/11 15:27:28 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. * @@ -68,24 +68,10 @@ /* Ensure that SHA_LONG and uint32_t are equivalent. */ CTASSERT(sizeof(SHA_LONG) == sizeof(uint32_t)); -#define DATA_ORDER_IS_BIG_ENDIAN - -#define HASH_LONG SHA_LONG -#define HASH_CTX SHA256_CTX -#define HASH_CBLOCK SHA_CBLOCK - -#define HASH_BLOCK_DATA_ORDER sha256_block_data_order - #ifdef SHA256_ASM void sha256_block_data_order(SHA256_CTX *ctx, const void *_in, size_t num); #endif -#define HASH_NO_UPDATE -#define HASH_NO_TRANSFORM -#define HASH_NO_FINAL - -#include "md32_common.h" - #ifndef SHA256_ASM static const SHA_LONG K256[64] = { 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, -- 2.20.1