diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/Symbols.list | 1 | ||||
| -rw-r--r-- | src/lib/libcrypto/hidden/openssl/hmac.h | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/hmac/hmac.c | 11 | ||||
| -rw-r--r-- | src/lib/libcrypto/hmac/hmac.h | 4 |
4 files changed, 3 insertions, 16 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index a7ea05436c..3eb64bb2d6 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
| @@ -1433,7 +1433,6 @@ HMAC_CTX_new | |||
| 1433 | HMAC_CTX_reset | 1433 | HMAC_CTX_reset |
| 1434 | HMAC_CTX_set_flags | 1434 | HMAC_CTX_set_flags |
| 1435 | HMAC_Final | 1435 | HMAC_Final |
| 1436 | HMAC_Init | ||
| 1437 | HMAC_Init_ex | 1436 | HMAC_Init_ex |
| 1438 | HMAC_Update | 1437 | HMAC_Update |
| 1439 | IPAddressChoice_free | 1438 | IPAddressChoice_free |
diff --git a/src/lib/libcrypto/hidden/openssl/hmac.h b/src/lib/libcrypto/hidden/openssl/hmac.h index ecf8aa9997..ef8d2187bb 100644 --- a/src/lib/libcrypto/hidden/openssl/hmac.h +++ b/src/lib/libcrypto/hidden/openssl/hmac.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: hmac.h,v 1.2 2023/07/05 21:14:54 bcook Exp $ */ | 1 | /* $OpenBSD: hmac.h,v 1.3 2024/08/31 10:42:21 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2016 Philip Guenther <guenther@openbsd.org> | 3 | * Copyright (c) 2016 Philip Guenther <guenther@openbsd.org> |
| 4 | * | 4 | * |
| @@ -28,7 +28,6 @@ | |||
| 28 | LCRYPTO_USED(HMAC_CTX_new); | 28 | LCRYPTO_USED(HMAC_CTX_new); |
| 29 | LCRYPTO_USED(HMAC_CTX_free); | 29 | LCRYPTO_USED(HMAC_CTX_free); |
| 30 | LCRYPTO_UNUSED(HMAC_CTX_reset); | 30 | LCRYPTO_UNUSED(HMAC_CTX_reset); |
| 31 | LCRYPTO_UNUSED(HMAC_Init); | ||
| 32 | LCRYPTO_USED(HMAC_Init_ex); | 31 | LCRYPTO_USED(HMAC_Init_ex); |
| 33 | LCRYPTO_USED(HMAC_Update); | 32 | LCRYPTO_USED(HMAC_Update); |
| 34 | LCRYPTO_USED(HMAC_Final); | 33 | LCRYPTO_USED(HMAC_Final); |
diff --git a/src/lib/libcrypto/hmac/hmac.c b/src/lib/libcrypto/hmac/hmac.c index 1315b1a0d2..dc1614d3ce 100644 --- a/src/lib/libcrypto/hmac/hmac.c +++ b/src/lib/libcrypto/hmac/hmac.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: hmac.c,v 1.35 2024/06/01 07:36:16 tb Exp $ */ | 1 | /* $OpenBSD: hmac.c,v 1.36 2024/08/31 10:42:21 tb 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 | * |
| @@ -137,15 +137,6 @@ err: | |||
| 137 | LCRYPTO_ALIAS(HMAC_Init_ex); | 137 | LCRYPTO_ALIAS(HMAC_Init_ex); |
| 138 | 138 | ||
| 139 | int | 139 | int |
| 140 | HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md) | ||
| 141 | { | ||
| 142 | if (key && md) | ||
| 143 | HMAC_CTX_init(ctx); | ||
| 144 | return HMAC_Init_ex(ctx, key, len, md, NULL); | ||
| 145 | } | ||
| 146 | LCRYPTO_ALIAS(HMAC_Init); | ||
| 147 | |||
| 148 | int | ||
| 149 | HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len) | 140 | HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len) |
| 150 | { | 141 | { |
| 151 | if (ctx->md == NULL) | 142 | if (ctx->md == NULL) |
diff --git a/src/lib/libcrypto/hmac/hmac.h b/src/lib/libcrypto/hmac/hmac.h index 0f39009c9d..6f29972aad 100644 --- a/src/lib/libcrypto/hmac/hmac.h +++ b/src/lib/libcrypto/hmac/hmac.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: hmac.h,v 1.19 2024/07/09 07:57:57 tb Exp $ */ | 1 | /* $OpenBSD: hmac.h,v 1.20 2024/08/31 10:42:21 tb 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 | * |
| @@ -82,8 +82,6 @@ HMAC_CTX *HMAC_CTX_new(void); | |||
| 82 | void HMAC_CTX_free(HMAC_CTX *ctx); | 82 | void HMAC_CTX_free(HMAC_CTX *ctx); |
| 83 | int HMAC_CTX_reset(HMAC_CTX *ctx); | 83 | int HMAC_CTX_reset(HMAC_CTX *ctx); |
| 84 | 84 | ||
| 85 | int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md) | ||
| 86 | __attribute__ ((__bounded__(__buffer__, 2, 3))); | ||
| 87 | int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md, | 85 | int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md, |
| 88 | ENGINE *impl) | 86 | ENGINE *impl) |
| 89 | __attribute__ ((__bounded__(__buffer__, 2, 3))); | 87 | __attribute__ ((__bounded__(__buffer__, 2, 3))); |
