summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2023-08-11 15:27:28 +0000
committerjsing <>2023-08-11 15:27:28 +0000
commit76134f41063e3f40f8163db32eec3bb91c52db18 (patch)
tree0c62aed2b758b6323287ac8eb6479a07fdc800cf /src
parent7a3dd68a4f6fdb4ee9becd43c30327999e64405c (diff)
downloadopenbsd-76134f41063e3f40f8163db32eec3bb91c52db18.tar.gz
openbsd-76134f41063e3f40f8163db32eec3bb91c52db18.tar.bz2
openbsd-76134f41063e3f40f8163db32eec3bb91c52db18.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/sha/sha256.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/lib/libcrypto/sha/sha256.c b/src/lib/libcrypto/sha/sha256.c
index c5f56f13dc..00c9368114 100644
--- a/src/lib/libcrypto/sha/sha256.c
+++ b/src/lib/libcrypto/sha/sha256.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sha256.c,v 1.29 2023/08/11 15:25:36 jsing Exp $ */ 1/* $OpenBSD: sha256.c,v 1.30 2023/08/11 15:27:28 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -68,24 +68,10 @@
68/* Ensure that SHA_LONG and uint32_t are equivalent. */ 68/* Ensure that SHA_LONG and uint32_t are equivalent. */
69CTASSERT(sizeof(SHA_LONG) == sizeof(uint32_t)); 69CTASSERT(sizeof(SHA_LONG) == sizeof(uint32_t));
70 70
71#define DATA_ORDER_IS_BIG_ENDIAN
72
73#define HASH_LONG SHA_LONG
74#define HASH_CTX SHA256_CTX
75#define HASH_CBLOCK SHA_CBLOCK
76
77#define HASH_BLOCK_DATA_ORDER sha256_block_data_order
78
79#ifdef SHA256_ASM 71#ifdef SHA256_ASM
80void sha256_block_data_order(SHA256_CTX *ctx, const void *_in, size_t num); 72void sha256_block_data_order(SHA256_CTX *ctx, const void *_in, size_t num);
81#endif 73#endif
82 74
83#define HASH_NO_UPDATE
84#define HASH_NO_TRANSFORM
85#define HASH_NO_FINAL
86
87#include "md32_common.h"
88
89#ifndef SHA256_ASM 75#ifndef SHA256_ASM
90static const SHA_LONG K256[64] = { 76static const SHA_LONG K256[64] = {
91 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, 77 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,