diff options
| author | Theo Buehler <tb@openbsd.org> | 2023-04-11 17:33:24 +0200 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2023-04-11 17:33:24 +0200 |
| commit | be58e25d2c6220ec7d299560facb1cf057dfb76d (patch) | |
| tree | 1aa37fcfa08bab7c53793837ee4867a15e03dd46 | |
| parent | 7f319186539ed6e6cf0e475cf84aef296b30b1a4 (diff) | |
| download | portable-be58e25d2c6220ec7d299560facb1cf057dfb76d.tar.gz portable-be58e25d2c6220ec7d299560facb1cf057dfb76d.tar.bz2 portable-be58e25d2c6220ec7d299560facb1cf057dfb76d.zip | |
Revert "Temporarily add sha512.c r1.27 as a patch"
This reverts commit e61927441352a7ac4c51b9b8fc2164d1d236e2f3.
| -rw-r--r-- | patches/sha512.c.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/patches/sha512.c.patch b/patches/sha512.c.patch deleted file mode 100644 index 92cfdf4..0000000 --- a/patches/sha512.c.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | diff -u -p -r1.29 -r1.28 | ||
| 2 | --- crypto/sha/sha512.c 11 Apr 2023 13:03:03 -0000 1.29 | ||
| 3 | +++ crypto/sha/sha512.c 11 Apr 2023 10:35:21 -0000 1.28 | ||
| 4 | @@ -546,28 +546,9 @@ SHA512_Final(unsigned char *md, SHA512_C | ||
| 5 | sha512_block_data_order(c, p, 1); | ||
| 6 | } | ||
| 7 | |||
| 8 | - memset (p + n, 0, sizeof(c->u) - 16 - n); | ||
| 9 | -#if BYTE_ORDER == BIG_ENDIAN | ||
| 10 | - c->u.d[SHA_LBLOCK - 2] = c->Nh; | ||
| 11 | - c->u.d[SHA_LBLOCK - 1] = c->Nl; | ||
| 12 | -#else | ||
| 13 | - p[sizeof(c->u) - 1] = (unsigned char)(c->Nl); | ||
| 14 | - p[sizeof(c->u) - 2] = (unsigned char)(c->Nl >> 8); | ||
| 15 | - p[sizeof(c->u) - 3] = (unsigned char)(c->Nl >> 16); | ||
| 16 | - p[sizeof(c->u) - 4] = (unsigned char)(c->Nl >> 24); | ||
| 17 | - p[sizeof(c->u) - 5] = (unsigned char)(c->Nl >> 32); | ||
| 18 | - p[sizeof(c->u) - 6] = (unsigned char)(c->Nl >> 40); | ||
| 19 | - p[sizeof(c->u) - 7] = (unsigned char)(c->Nl >> 48); | ||
| 20 | - p[sizeof(c->u) - 8] = (unsigned char)(c->Nl >> 56); | ||
| 21 | - p[sizeof(c->u) - 9] = (unsigned char)(c->Nh); | ||
| 22 | - p[sizeof(c->u) - 10] = (unsigned char)(c->Nh >> 8); | ||
| 23 | - p[sizeof(c->u) - 11] = (unsigned char)(c->Nh >> 16); | ||
| 24 | - p[sizeof(c->u) - 12] = (unsigned char)(c->Nh >> 24); | ||
| 25 | - p[sizeof(c->u) - 13] = (unsigned char)(c->Nh >> 32); | ||
| 26 | - p[sizeof(c->u) - 14] = (unsigned char)(c->Nh >> 40); | ||
| 27 | - p[sizeof(c->u) - 15] = (unsigned char)(c->Nh >> 48); | ||
| 28 | - p[sizeof(c->u) - 16] = (unsigned char)(c->Nh >> 56); | ||
| 29 | -#endif | ||
| 30 | + memset(p + n, 0, sizeof(c->u) - 16 - n); | ||
| 31 | + c->u.d[SHA_LBLOCK - 2] = htobe64(c->Nh); | ||
| 32 | + c->u.d[SHA_LBLOCK - 1] = htobe64(c->Nl); | ||
| 33 | |||
| 34 | sha512_block_data_order(c, p, 1); | ||
| 35 | |||
