summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2023-05-28 14:49:21 +0000
committerjsing <>2023-05-28 14:49:21 +0000
commit1227f74ef4abd07e37aff33a87030eb9a5aac425 (patch)
tree2de93350423e2107d069dcee48100612763ff759 /src
parent5461471aa9e2132fb780d650c80d2d98b4b596fe (diff)
downloadopenbsd-1227f74ef4abd07e37aff33a87030eb9a5aac425.tar.gz
openbsd-1227f74ef4abd07e37aff33a87030eb9a5aac425.tar.bz2
openbsd-1227f74ef4abd07e37aff33a87030eb9a5aac425.zip
Expand occurrences of HASH_CTX that were previously missed.
No change in generated assembly.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/sha/sha256.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libcrypto/sha/sha256.c b/src/lib/libcrypto/sha/sha256.c
index 5b536bfba7..ffc5ff7da5 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.20 2023/05/28 14:14:33 jsing Exp $ */ 1/* $OpenBSD: sha256.c,v 1.21 2023/05/28 14:49:21 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 *
@@ -70,6 +70,7 @@
70#define HASH_CBLOCK SHA_CBLOCK 70#define HASH_CBLOCK SHA_CBLOCK
71 71
72#define HASH_BLOCK_DATA_ORDER sha256_block_data_order 72#define HASH_BLOCK_DATA_ORDER sha256_block_data_order
73
73#ifndef SHA256_ASM 74#ifndef SHA256_ASM
74static 75static
75#endif 76#endif
@@ -397,7 +398,7 @@ SHA256_Init(SHA256_CTX *c)
397} 398}
398 399
399int 400int
400SHA256_Update(HASH_CTX *c, const void *data_, size_t len) 401SHA256_Update(SHA256_CTX *c, const void *data_, size_t len)
401{ 402{
402 const unsigned char *data = data_; 403 const unsigned char *data = data_;
403 unsigned char *p; 404 unsigned char *p;
@@ -451,13 +452,13 @@ SHA256_Update(HASH_CTX *c, const void *data_, size_t len)
451} 452}
452 453
453void 454void
454SHA256_Transform(HASH_CTX *c, const unsigned char *data) 455SHA256_Transform(SHA256_CTX *c, const unsigned char *data)
455{ 456{
456 sha256_block_data_order(c, data, 1); 457 sha256_block_data_order(c, data, 1);
457} 458}
458 459
459int 460int
460SHA256_Final(unsigned char *md, HASH_CTX *c) 461SHA256_Final(unsigned char *md, SHA256_CTX *c)
461{ 462{
462 unsigned char *p = (unsigned char *)c->data; 463 unsigned char *p = (unsigned char *)c->data;
463 size_t n = c->num; 464 size_t n = c->num;