summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/sha
diff options
context:
space:
mode:
authorjsing <>2023-08-10 07:15:23 +0000
committerjsing <>2023-08-10 07:15:23 +0000
commit5ccf52b751e2b7dd5a5c0593f12b501074180fff (patch)
tree9ca48e5b24acc855af178267c3089d8f870623b0 /src/lib/libcrypto/sha
parent0c67b8136f2ccb712ba6ab0d74f8dac9b61c59e8 (diff)
downloadopenbsd-5ccf52b751e2b7dd5a5c0593f12b501074180fff.tar.gz
openbsd-5ccf52b751e2b7dd5a5c0593f12b501074180fff.tar.bz2
openbsd-5ccf52b751e2b7dd5a5c0593f12b501074180fff.zip
Remove MD32_REG_T.
This is a hack that is only enabled on a handful of 64 bit platforms, as a workaround for poor compiler optimisation. If you're running an archiac compiler on an archiac architecture, then you can deal with slightly lower performance. ok tb@
Diffstat (limited to 'src/lib/libcrypto/sha')
-rw-r--r--src/lib/libcrypto/sha/sha1.c6
-rw-r--r--src/lib/libcrypto/sha/sha256.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/sha/sha1.c b/src/lib/libcrypto/sha/sha1.c
index 6e35d797b5..4b48653bdb 100644
--- a/src/lib/libcrypto/sha/sha1.c
+++ b/src/lib/libcrypto/sha/sha1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sha1.c,v 1.11 2023/07/08 12:24:10 beck Exp $ */ 1/* $OpenBSD: sha1.c,v 1.12 2023/08/10 07:15:23 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -141,8 +141,8 @@ static void
141sha1_block_data_order(SHA_CTX *c, const void *p, size_t num) 141sha1_block_data_order(SHA_CTX *c, const void *p, size_t num)
142{ 142{
143 const unsigned char *data = p; 143 const unsigned char *data = p;
144 unsigned MD32_REG_T A, B, C, D, E, T, l; 144 unsigned int A, B, C, D, E, T, l;
145 unsigned MD32_REG_T X0, X1, X2, X3, X4, X5, X6, X7, 145 unsigned int X0, X1, X2, X3, X4, X5, X6, X7,
146 X8, X9, X10, X11, X12, X13, X14, X15; 146 X8, X9, X10, X11, X12, X13, X14, X15;
147 147
148 A = c->h0; 148 A = c->h0;
diff --git a/src/lib/libcrypto/sha/sha256.c b/src/lib/libcrypto/sha/sha256.c
index 0d0c4231ef..231a5a058c 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.27 2023/07/08 12:24:10 beck Exp $ */ 1/* $OpenBSD: sha256.c,v 1.28 2023/08/10 07:15:23 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 *
@@ -135,7 +135,7 @@ sha256_block_data_order(SHA256_CTX *ctx, const void *_in, size_t num)
135{ 135{
136 const uint8_t *in = _in; 136 const uint8_t *in = _in;
137 const SHA_LONG *in32; 137 const SHA_LONG *in32;
138 unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1; 138 unsigned int a, b, c, d, e, f, g, h, s0, s1, T1;
139 SHA_LONG X[16]; 139 SHA_LONG X[16];
140 int i; 140 int i;
141 141