summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/evp_aead.c
diff options
context:
space:
mode:
authorbeck <>2023-07-07 19:37:54 +0000
committerbeck <>2023-07-07 19:37:54 +0000
commit8d42940c1d19bb9bd4ce45580f18a59069225432 (patch)
treeb1fe16b4625998f0f024f4d3eef5d59a3e905a9a /src/lib/libcrypto/evp/evp_aead.c
parent1c5e77a1d6f97589e2bca622f3313c1418f9a535 (diff)
downloadopenbsd-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.c12
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}
31LCRYPTO_ALIAS(EVP_AEAD_key_length);
32 31
33size_t 32size_t
34EVP_AEAD_nonce_length(const EVP_AEAD *aead) 33EVP_AEAD_nonce_length(const EVP_AEAD *aead)
35{ 34{
36 return aead->nonce_len; 35 return aead->nonce_len;
37} 36}
38LCRYPTO_ALIAS(EVP_AEAD_nonce_length);
39 37
40size_t 38size_t
41EVP_AEAD_max_overhead(const EVP_AEAD *aead) 39EVP_AEAD_max_overhead(const EVP_AEAD *aead)
42{ 40{
43 return aead->overhead; 41 return aead->overhead;
44} 42}
45LCRYPTO_ALIAS(EVP_AEAD_max_overhead);
46 43
47size_t 44size_t
48EVP_AEAD_max_tag_len(const EVP_AEAD *aead) 45EVP_AEAD_max_tag_len(const EVP_AEAD *aead)
49{ 46{
50 return aead->max_tag_len; 47 return aead->max_tag_len;
51} 48}
52LCRYPTO_ALIAS(EVP_AEAD_max_tag_len);
53 49
54int 50int
55EVP_AEAD_CTX_init(EVP_AEAD_CTX *ctx, const EVP_AEAD *aead, 51EVP_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}
65LCRYPTO_ALIAS(EVP_AEAD_CTX_init);
66 61
67void 62void
68EVP_AEAD_CTX_cleanup(EVP_AEAD_CTX *ctx) 63EVP_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}
75LCRYPTO_ALIAS(EVP_AEAD_CTX_cleanup);
76 70
77EVP_AEAD_CTX * 71EVP_AEAD_CTX *
78EVP_AEAD_CTX_new(void) 72EVP_AEAD_CTX_new(void)
79{ 73{
80 return calloc(1, sizeof(EVP_AEAD_CTX)); 74 return calloc(1, sizeof(EVP_AEAD_CTX));
81} 75}
82LCRYPTO_ALIAS(EVP_AEAD_CTX_new);
83 76
84void 77void
85EVP_AEAD_CTX_free(EVP_AEAD_CTX *ctx) 78EVP_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}
93LCRYPTO_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}
144LCRYPTO_ALIAS(EVP_AEAD_CTX_seal);
145 136
146int 137int
147EVP_AEAD_CTX_open(const EVP_AEAD_CTX *ctx, unsigned char *out, size_t *out_len, 138EVP_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}
170LCRYPTO_ALIAS(EVP_AEAD_CTX_open);