diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/Symbols.namespace | 5 | ||||
| -rw-r--r-- | src/lib/libcrypto/hidden/openssl/whrlpool.h | 34 | ||||
| -rw-r--r-- | src/lib/libcrypto/whrlpool/whirlpool.c | 7 |
3 files changed, 45 insertions, 1 deletions
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace index 812a4280db..21f24c9ef5 100644 --- a/src/lib/libcrypto/Symbols.namespace +++ b/src/lib/libcrypto/Symbols.namespace | |||
| @@ -2599,3 +2599,8 @@ _libre_CMS_get1_ReceiptRequest | |||
| 2599 | _libre_CMS_ReceiptRequest_create0 | 2599 | _libre_CMS_ReceiptRequest_create0 |
| 2600 | _libre_CMS_add1_ReceiptRequest | 2600 | _libre_CMS_add1_ReceiptRequest |
| 2601 | _libre_CMS_ReceiptRequest_get0_values | 2601 | _libre_CMS_ReceiptRequest_get0_values |
| 2602 | _libre_WHIRLPOOL_Init | ||
| 2603 | _libre_WHIRLPOOL_Update | ||
| 2604 | _libre_WHIRLPOOL_BitUpdate | ||
| 2605 | _libre_WHIRLPOOL_Final | ||
| 2606 | _libre_WHIRLPOOL | ||
diff --git a/src/lib/libcrypto/hidden/openssl/whrlpool.h b/src/lib/libcrypto/hidden/openssl/whrlpool.h new file mode 100644 index 0000000000..c3e4a51d38 --- /dev/null +++ b/src/lib/libcrypto/hidden/openssl/whrlpool.h | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | /* $OpenBSD: whrlpool.h,v 1.1 2024/03/30 03:45:47 joshua Exp $ */ | ||
| 2 | /* | ||
| 3 | * Copyright (c) 2024 Joshua Sing <joshua@joshuasing.dev> | ||
| 4 | * | ||
| 5 | * Permission to use, copy, modify, and distribute this software for any | ||
| 6 | * purpose with or without fee is hereby granted, provided that the above | ||
| 7 | * copyright notice and this permission notice appear in all copies. | ||
| 8 | * | ||
| 9 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
| 10 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
| 11 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
| 12 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| 13 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
| 14 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
| 15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef _LIBCRYPTO_WHRLPOOL_H | ||
| 19 | #define _LIBCRYPTO_WHRLPOOL_H | ||
| 20 | |||
| 21 | #ifndef _MSC_VER | ||
| 22 | #include_next <openssl/whrlpool.h> | ||
| 23 | #else | ||
| 24 | #include "../include/openssl/whrlpool.h" | ||
| 25 | #endif | ||
| 26 | #include "crypto_namespace.h" | ||
| 27 | |||
| 28 | LCRYPTO_USED(WHIRLPOOL_Init); | ||
| 29 | LCRYPTO_USED(WHIRLPOOL_Update); | ||
| 30 | LCRYPTO_USED(WHIRLPOOL_BitUpdate); | ||
| 31 | LCRYPTO_USED(WHIRLPOOL_Final); | ||
| 32 | LCRYPTO_USED(WHIRLPOOL); | ||
| 33 | |||
| 34 | #endif /* _LIBCRYPTO_WHRLPOOL_H */ | ||
diff --git a/src/lib/libcrypto/whrlpool/whirlpool.c b/src/lib/libcrypto/whrlpool/whirlpool.c index 217c5a919b..e1e0f7a899 100644 --- a/src/lib/libcrypto/whrlpool/whirlpool.c +++ b/src/lib/libcrypto/whrlpool/whirlpool.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: whirlpool.c,v 1.1 2024/03/29 02:41:49 jsing Exp $ */ | 1 | /* $OpenBSD: whirlpool.c,v 1.2 2024/03/30 03:45:47 joshua Exp $ */ |
| 2 | /** | 2 | /** |
| 3 | * The Whirlpool hashing function. | 3 | * The Whirlpool hashing function. |
| 4 | * | 4 | * |
| @@ -650,6 +650,7 @@ WHIRLPOOL_Init(WHIRLPOOL_CTX *c) | |||
| 650 | memset (c, 0, sizeof(*c)); | 650 | memset (c, 0, sizeof(*c)); |
| 651 | return (1); | 651 | return (1); |
| 652 | } | 652 | } |
| 653 | LCRYPTO_ALIAS(WHIRLPOOL_Init); | ||
| 653 | 654 | ||
| 654 | int | 655 | int |
| 655 | WHIRLPOOL_Update(WHIRLPOOL_CTX *c, const void *_inp, size_t bytes) | 656 | WHIRLPOOL_Update(WHIRLPOOL_CTX *c, const void *_inp, size_t bytes) |
| @@ -671,6 +672,7 @@ WHIRLPOOL_Update(WHIRLPOOL_CTX *c, const void *_inp, size_t bytes) | |||
| 671 | 672 | ||
| 672 | return (1); | 673 | return (1); |
| 673 | } | 674 | } |
| 675 | LCRYPTO_ALIAS(WHIRLPOOL_Update); | ||
| 674 | 676 | ||
| 675 | void | 677 | void |
| 676 | WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits) | 678 | WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits) |
| @@ -796,6 +798,7 @@ reconsider: | |||
| 796 | } | 798 | } |
| 797 | } | 799 | } |
| 798 | } | 800 | } |
| 801 | LCRYPTO_ALIAS(WHIRLPOOL_BitUpdate); | ||
| 799 | 802 | ||
| 800 | int | 803 | int |
| 801 | WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c) | 804 | WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c) |
| @@ -837,6 +840,7 @@ WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c) | |||
| 837 | } | 840 | } |
| 838 | return (0); | 841 | return (0); |
| 839 | } | 842 | } |
| 843 | LCRYPTO_ALIAS(WHIRLPOOL_Final); | ||
| 840 | 844 | ||
| 841 | unsigned char * | 845 | unsigned char * |
| 842 | WHIRLPOOL(const void *inp, size_t bytes, unsigned char *md) | 846 | WHIRLPOOL(const void *inp, size_t bytes, unsigned char *md) |
| @@ -851,3 +855,4 @@ WHIRLPOOL(const void *inp, size_t bytes, unsigned char *md) | |||
| 851 | WHIRLPOOL_Final(md, &ctx); | 855 | WHIRLPOOL_Final(md, &ctx); |
| 852 | return (md); | 856 | return (md); |
| 853 | } | 857 | } |
| 858 | LCRYPTO_ALIAS(WHIRLPOOL); | ||
