diff options
author | beck <> | 2023-07-07 19:37:54 +0000 |
---|---|---|
committer | beck <> | 2023-07-07 19:37:54 +0000 |
commit | 8d42940c1d19bb9bd4ce45580f18a59069225432 (patch) | |
tree | b1fe16b4625998f0f024f4d3eef5d59a3e905a9a /src/lib/libcrypto/evp/evp_aead.c | |
parent | 1c5e77a1d6f97589e2bca622f3313c1418f9a535 (diff) | |
download | openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.tar.gz openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.tar.bz2 openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.zip |
Unbreak the namespace build after a broken mk.conf and tool misfire had
me aliasing symbols not in the headers I was procesing.
This unbreaks the namespace build so it will pass again
ok tb@
Diffstat (limited to 'src/lib/libcrypto/evp/evp_aead.c')
-rw-r--r-- | src/lib/libcrypto/evp/evp_aead.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/libcrypto/evp/evp_aead.c b/src/lib/libcrypto/evp/evp_aead.c index 8b39c7f923..3579533e5b 100644 --- a/src/lib/libcrypto/evp/evp_aead.c +++ b/src/lib/libcrypto/evp/evp_aead.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp_aead.c,v 1.9 2023/07/07 13:54:45 beck Exp $ */ | 1 | /* $OpenBSD: evp_aead.c,v 1.10 2023/07/07 19:37:53 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014, Google Inc. | 3 | * Copyright (c) 2014, Google Inc. |
4 | * | 4 | * |
@@ -28,28 +28,24 @@ EVP_AEAD_key_length(const EVP_AEAD *aead) | |||
28 | { | 28 | { |
29 | return aead->key_len; | 29 | return aead->key_len; |
30 | } | 30 | } |
31 | LCRYPTO_ALIAS(EVP_AEAD_key_length); | ||
32 | 31 | ||
33 | size_t | 32 | size_t |
34 | EVP_AEAD_nonce_length(const EVP_AEAD *aead) | 33 | EVP_AEAD_nonce_length(const EVP_AEAD *aead) |
35 | { | 34 | { |
36 | return aead->nonce_len; | 35 | return aead->nonce_len; |
37 | } | 36 | } |
38 | LCRYPTO_ALIAS(EVP_AEAD_nonce_length); | ||
39 | 37 | ||
40 | size_t | 38 | size_t |
41 | EVP_AEAD_max_overhead(const EVP_AEAD *aead) | 39 | EVP_AEAD_max_overhead(const EVP_AEAD *aead) |
42 | { | 40 | { |
43 | return aead->overhead; | 41 | return aead->overhead; |
44 | } | 42 | } |
45 | LCRYPTO_ALIAS(EVP_AEAD_max_overhead); | ||
46 | 43 | ||
47 | size_t | 44 | size_t |
48 | EVP_AEAD_max_tag_len(const EVP_AEAD *aead) | 45 | EVP_AEAD_max_tag_len(const EVP_AEAD *aead) |
49 | { | 46 | { |
50 | return aead->max_tag_len; | 47 | return aead->max_tag_len; |
51 | } | 48 | } |
52 | LCRYPTO_ALIAS(EVP_AEAD_max_tag_len); | ||
53 | 49 | ||
54 | int | 50 | int |
55 | EVP_AEAD_CTX_init(EVP_AEAD_CTX *ctx, const EVP_AEAD *aead, | 51 | EVP_AEAD_CTX_init(EVP_AEAD_CTX *ctx, const EVP_AEAD *aead, |
@@ -62,7 +58,6 @@ EVP_AEAD_CTX_init(EVP_AEAD_CTX *ctx, const EVP_AEAD *aead, | |||
62 | } | 58 | } |
63 | return aead->init(ctx, key, key_len, tag_len); | 59 | return aead->init(ctx, key, key_len, tag_len); |
64 | } | 60 | } |
65 | LCRYPTO_ALIAS(EVP_AEAD_CTX_init); | ||
66 | 61 | ||
67 | void | 62 | void |
68 | EVP_AEAD_CTX_cleanup(EVP_AEAD_CTX *ctx) | 63 | EVP_AEAD_CTX_cleanup(EVP_AEAD_CTX *ctx) |
@@ -72,14 +67,12 @@ EVP_AEAD_CTX_cleanup(EVP_AEAD_CTX *ctx) | |||
72 | ctx->aead->cleanup(ctx); | 67 | ctx->aead->cleanup(ctx); |
73 | ctx->aead = NULL; | 68 | ctx->aead = NULL; |
74 | } | 69 | } |
75 | LCRYPTO_ALIAS(EVP_AEAD_CTX_cleanup); | ||
76 | 70 | ||
77 | EVP_AEAD_CTX * | 71 | EVP_AEAD_CTX * |
78 | EVP_AEAD_CTX_new(void) | 72 | EVP_AEAD_CTX_new(void) |
79 | { | 73 | { |
80 | return calloc(1, sizeof(EVP_AEAD_CTX)); | 74 | return calloc(1, sizeof(EVP_AEAD_CTX)); |
81 | } | 75 | } |
82 | LCRYPTO_ALIAS(EVP_AEAD_CTX_new); | ||
83 | 76 | ||
84 | void | 77 | void |
85 | EVP_AEAD_CTX_free(EVP_AEAD_CTX *ctx) | 78 | EVP_AEAD_CTX_free(EVP_AEAD_CTX *ctx) |
@@ -90,7 +83,6 @@ EVP_AEAD_CTX_free(EVP_AEAD_CTX *ctx) | |||
90 | EVP_AEAD_CTX_cleanup(ctx); | 83 | EVP_AEAD_CTX_cleanup(ctx); |
91 | free(ctx); | 84 | free(ctx); |
92 | } | 85 | } |
93 | LCRYPTO_ALIAS(EVP_AEAD_CTX_free); | ||
94 | 86 | ||
95 | /* check_alias returns 0 if out points within the buffer determined by in | 87 | /* check_alias returns 0 if out points within the buffer determined by in |
96 | * and in_len and 1 otherwise. | 88 | * and in_len and 1 otherwise. |
@@ -141,7 +133,6 @@ error: | |||
141 | *out_len = 0; | 133 | *out_len = 0; |
142 | return 0; | 134 | return 0; |
143 | } | 135 | } |
144 | LCRYPTO_ALIAS(EVP_AEAD_CTX_seal); | ||
145 | 136 | ||
146 | int | 137 | int |
147 | EVP_AEAD_CTX_open(const EVP_AEAD_CTX *ctx, unsigned char *out, size_t *out_len, | 138 | EVP_AEAD_CTX_open(const EVP_AEAD_CTX *ctx, unsigned char *out, size_t *out_len, |
@@ -167,4 +158,3 @@ error: | |||
167 | *out_len = 0; | 158 | *out_len = 0; |
168 | return 0; | 159 | return 0; |
169 | } | 160 | } |
170 | LCRYPTO_ALIAS(EVP_AEAD_CTX_open); | ||