diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/md5/md5.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/libcrypto/md5/md5.c b/src/lib/libcrypto/md5/md5.c index 7472cb625b..fade2d5416 100644 --- a/src/lib/libcrypto/md5/md5.c +++ b/src/lib/libcrypto/md5/md5.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: md5.c,v 1.11 2023/08/10 13:59:31 jsing Exp $ */ | 1 | /* $OpenBSD: md5.c,v 1.12 2023/08/10 14:03:47 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 | * |
| @@ -87,13 +87,6 @@ __END_HIDDEN_DECLS | |||
| 87 | #define HASH_UPDATE MD5_Update | 87 | #define HASH_UPDATE MD5_Update |
| 88 | #define HASH_TRANSFORM MD5_Transform | 88 | #define HASH_TRANSFORM MD5_Transform |
| 89 | #define HASH_FINAL MD5_Final | 89 | #define HASH_FINAL MD5_Final |
| 90 | #define HASH_MAKE_STRING(c,s) do { \ | ||
| 91 | unsigned long ll; \ | ||
| 92 | ll=(c)->A; HOST_l2c(ll,(s)); \ | ||
| 93 | ll=(c)->B; HOST_l2c(ll,(s)); \ | ||
| 94 | ll=(c)->C; HOST_l2c(ll,(s)); \ | ||
| 95 | ll=(c)->D; HOST_l2c(ll,(s)); \ | ||
| 96 | } while (0) | ||
| 97 | #define HASH_BLOCK_DATA_ORDER md5_block_data_order | 90 | #define HASH_BLOCK_DATA_ORDER md5_block_data_order |
| 98 | 91 | ||
| 99 | #define HASH_NO_UPDATE | 92 | #define HASH_NO_UPDATE |
| @@ -371,11 +364,18 @@ MD5_Final(unsigned char *md, MD5_CTX *c) | |||
| 371 | c->num = 0; | 364 | c->num = 0; |
| 372 | memset(p, 0, MD5_CBLOCK); | 365 | memset(p, 0, MD5_CBLOCK); |
| 373 | 366 | ||
| 374 | #ifndef HASH_MAKE_STRING | 367 | do { |
| 375 | #error "HASH_MAKE_STRING must be defined!" | 368 | unsigned long ll; |
| 376 | #else | 369 | |
| 377 | HASH_MAKE_STRING(c, md); | 370 | ll = c->A; |
| 378 | #endif | 371 | HOST_l2c(ll, md); |
| 372 | ll = c->B; | ||
| 373 | HOST_l2c(ll, md); | ||
| 374 | ll = c->C; | ||
| 375 | HOST_l2c(ll, md); | ||
| 376 | ll = c->D; | ||
| 377 | HOST_l2c(ll, md); | ||
| 378 | } while (0); | ||
| 379 | 379 | ||
| 380 | return 1; | 380 | return 1; |
| 381 | } | 381 | } |
