diff options
| author | jsing <> | 2023-08-11 15:27:28 +0000 |
|---|---|---|
| committer | jsing <> | 2023-08-11 15:27:28 +0000 |
| commit | 2ea556a1c666b7176ccef64d78e376f1bfabef7c (patch) | |
| tree | 0c62aed2b758b6323287ac8eb6479a07fdc800cf /src | |
| parent | e5c37e5e9f9d7f447090e5f144afac1bcc9341d9 (diff) | |
| download | openbsd-2ea556a1c666b7176ccef64d78e376f1bfabef7c.tar.gz openbsd-2ea556a1c666b7176ccef64d78e376f1bfabef7c.tar.bz2 openbsd-2ea556a1c666b7176ccef64d78e376f1bfabef7c.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 '')
| -rw-r--r-- | src/lib/libcrypto/sha/sha256.c | 16 |
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. */ |
| 69 | CTASSERT(sizeof(SHA_LONG) == sizeof(uint32_t)); | 69 | CTASSERT(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 |
| 80 | void sha256_block_data_order(SHA256_CTX *ctx, const void *_in, size_t num); | 72 | void 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 |
| 90 | static const SHA_LONG K256[64] = { | 76 | static const SHA_LONG K256[64] = { |
| 91 | 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, | 77 | 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, |
