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/encode.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/encode.c')
-rw-r--r-- | src/lib/libcrypto/evp/encode.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/libcrypto/evp/encode.c b/src/lib/libcrypto/evp/encode.c index 10cb51217a..c62a1dea8f 100644 --- a/src/lib/libcrypto/evp/encode.c +++ b/src/lib/libcrypto/evp/encode.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: encode.c,v 1.31 2023/07/07 13:54:45 beck Exp $ */ | 1 | /* $OpenBSD: encode.c,v 1.32 2023/07/07 19:37:53 beck 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 | * |
@@ -128,14 +128,12 @@ EVP_ENCODE_CTX_new(void) | |||
128 | { | 128 | { |
129 | return calloc(1, sizeof(EVP_ENCODE_CTX)); | 129 | return calloc(1, sizeof(EVP_ENCODE_CTX)); |
130 | } | 130 | } |
131 | LCRYPTO_ALIAS(EVP_ENCODE_CTX_new); | ||
132 | 131 | ||
133 | void | 132 | void |
134 | EVP_ENCODE_CTX_free(EVP_ENCODE_CTX *ctx) | 133 | EVP_ENCODE_CTX_free(EVP_ENCODE_CTX *ctx) |
135 | { | 134 | { |
136 | free(ctx); | 135 | free(ctx); |
137 | } | 136 | } |
138 | LCRYPTO_ALIAS(EVP_ENCODE_CTX_free); | ||
139 | 137 | ||
140 | void | 138 | void |
141 | EVP_EncodeInit(EVP_ENCODE_CTX *ctx) | 139 | EVP_EncodeInit(EVP_ENCODE_CTX *ctx) |
@@ -144,7 +142,6 @@ EVP_EncodeInit(EVP_ENCODE_CTX *ctx) | |||
144 | ctx->num = 0; | 142 | ctx->num = 0; |
145 | ctx->line_num = 0; | 143 | ctx->line_num = 0; |
146 | } | 144 | } |
147 | LCRYPTO_ALIAS(EVP_EncodeInit); | ||
148 | 145 | ||
149 | int | 146 | int |
150 | EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl, | 147 | EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl, |
@@ -195,7 +192,6 @@ EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl, | |||
195 | 192 | ||
196 | return 1; | 193 | return 1; |
197 | } | 194 | } |
198 | LCRYPTO_ALIAS(EVP_EncodeUpdate); | ||
199 | 195 | ||
200 | void | 196 | void |
201 | EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl) | 197 | EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl) |
@@ -210,7 +206,6 @@ EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl) | |||
210 | } | 206 | } |
211 | *outl = ret; | 207 | *outl = ret; |
212 | } | 208 | } |
213 | LCRYPTO_ALIAS(EVP_EncodeFinal); | ||
214 | 209 | ||
215 | int | 210 | int |
216 | EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int dlen) | 211 | EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int dlen) |
@@ -243,7 +238,6 @@ EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int dlen) | |||
243 | *t = '\0'; | 238 | *t = '\0'; |
244 | return (ret); | 239 | return (ret); |
245 | } | 240 | } |
246 | LCRYPTO_ALIAS(EVP_EncodeBlock); | ||
247 | 241 | ||
248 | void | 242 | void |
249 | EVP_DecodeInit(EVP_ENCODE_CTX *ctx) | 243 | EVP_DecodeInit(EVP_ENCODE_CTX *ctx) |
@@ -253,7 +247,6 @@ EVP_DecodeInit(EVP_ENCODE_CTX *ctx) | |||
253 | ctx->line_num = 0; | 247 | ctx->line_num = 0; |
254 | ctx->expect_nl = 0; | 248 | ctx->expect_nl = 0; |
255 | } | 249 | } |
256 | LCRYPTO_ALIAS(EVP_DecodeInit); | ||
257 | 250 | ||
258 | int | 251 | int |
259 | EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl, | 252 | EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl, |
@@ -362,7 +355,6 @@ EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl, | |||
362 | ctx->num = n; | 355 | ctx->num = n; |
363 | return (rv); | 356 | return (rv); |
364 | } | 357 | } |
365 | LCRYPTO_ALIAS(EVP_DecodeUpdate); | ||
366 | 358 | ||
367 | int | 359 | int |
368 | EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n) | 360 | EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n) |
@@ -403,7 +395,6 @@ EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n) | |||
403 | } | 395 | } |
404 | return (ret); | 396 | return (ret); |
405 | } | 397 | } |
406 | LCRYPTO_ALIAS(EVP_DecodeBlock); | ||
407 | 398 | ||
408 | int | 399 | int |
409 | EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl) | 400 | EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl) |
@@ -421,4 +412,3 @@ EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl) | |||
421 | } else | 412 | } else |
422 | return (1); | 413 | return (1); |
423 | } | 414 | } |
424 | LCRYPTO_ALIAS(EVP_DecodeFinal); | ||