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/names.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/names.c')
-rw-r--r-- | src/lib/libcrypto/evp/names.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/libcrypto/evp/names.c b/src/lib/libcrypto/evp/names.c index c6109a5356..f7864f5958 100644 --- a/src/lib/libcrypto/evp/names.c +++ b/src/lib/libcrypto/evp/names.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: names.c,v 1.18 2023/07/07 13:54:46 beck Exp $ */ | 1 | /* $OpenBSD: names.c,v 1.19 2023/07/07 19:37:54 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 | * |
@@ -84,7 +84,6 @@ EVP_add_cipher(const EVP_CIPHER *c) | |||
84 | (const char *)c); | 84 | (const char *)c); |
85 | return (r); | 85 | return (r); |
86 | } | 86 | } |
87 | LCRYPTO_ALIAS(EVP_add_cipher); | ||
88 | 87 | ||
89 | int | 88 | int |
90 | EVP_add_digest(const EVP_MD *md) | 89 | EVP_add_digest(const EVP_MD *md) |
@@ -113,7 +112,6 @@ EVP_add_digest(const EVP_MD *md) | |||
113 | } | 112 | } |
114 | return (r); | 113 | return (r); |
115 | } | 114 | } |
116 | LCRYPTO_ALIAS(EVP_add_digest); | ||
117 | 115 | ||
118 | const EVP_CIPHER * | 116 | const EVP_CIPHER * |
119 | EVP_get_cipherbyname(const char *name) | 117 | EVP_get_cipherbyname(const char *name) |
@@ -126,7 +124,6 @@ EVP_get_cipherbyname(const char *name) | |||
126 | cp = (const EVP_CIPHER *)OBJ_NAME_get(name, OBJ_NAME_TYPE_CIPHER_METH); | 124 | cp = (const EVP_CIPHER *)OBJ_NAME_get(name, OBJ_NAME_TYPE_CIPHER_METH); |
127 | return (cp); | 125 | return (cp); |
128 | } | 126 | } |
129 | LCRYPTO_ALIAS(EVP_get_cipherbyname); | ||
130 | 127 | ||
131 | const EVP_MD * | 128 | const EVP_MD * |
132 | EVP_get_digestbyname(const char *name) | 129 | EVP_get_digestbyname(const char *name) |
@@ -139,7 +136,6 @@ EVP_get_digestbyname(const char *name) | |||
139 | cp = (const EVP_MD *)OBJ_NAME_get(name, OBJ_NAME_TYPE_MD_METH); | 136 | cp = (const EVP_MD *)OBJ_NAME_get(name, OBJ_NAME_TYPE_MD_METH); |
140 | return (cp); | 137 | return (cp); |
141 | } | 138 | } |
142 | LCRYPTO_ALIAS(EVP_get_digestbyname); | ||
143 | 139 | ||
144 | void | 140 | void |
145 | EVP_cleanup(void) | 141 | EVP_cleanup(void) |
@@ -158,7 +154,6 @@ EVP_cleanup(void) | |||
158 | } | 154 | } |
159 | OBJ_sigid_free(); | 155 | OBJ_sigid_free(); |
160 | } | 156 | } |
161 | LCRYPTO_ALIAS(EVP_cleanup); | ||
162 | 157 | ||
163 | struct doall_cipher { | 158 | struct doall_cipher { |
164 | void *arg; | 159 | void *arg; |
@@ -190,7 +185,6 @@ EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph, const char *from, | |||
190 | dc.arg = arg; | 185 | dc.arg = arg; |
191 | OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc); | 186 | OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc); |
192 | } | 187 | } |
193 | LCRYPTO_ALIAS(EVP_CIPHER_do_all); | ||
194 | 188 | ||
195 | void | 189 | void |
196 | EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph, const char *from, | 190 | EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph, const char *from, |
@@ -206,7 +200,6 @@ EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph, const char *from, | |||
206 | OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, | 200 | OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, |
207 | do_all_cipher_fn, &dc); | 201 | do_all_cipher_fn, &dc); |
208 | } | 202 | } |
209 | LCRYPTO_ALIAS(EVP_CIPHER_do_all_sorted); | ||
210 | 203 | ||
211 | struct doall_md { | 204 | struct doall_md { |
212 | void *arg; | 205 | void *arg; |
@@ -238,7 +231,6 @@ EVP_MD_do_all(void (*fn)(const EVP_MD *md, const char *from, const char *to, | |||
238 | dc.arg = arg; | 231 | dc.arg = arg; |
239 | OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc); | 232 | OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc); |
240 | } | 233 | } |
241 | LCRYPTO_ALIAS(EVP_MD_do_all); | ||
242 | 234 | ||
243 | void | 235 | void |
244 | EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md, | 236 | EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md, |
@@ -253,4 +245,3 @@ EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md, | |||
253 | dc.arg = arg; | 245 | dc.arg = arg; |
254 | OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc); | 246 | OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc); |
255 | } | 247 | } |
256 | LCRYPTO_ALIAS(EVP_MD_do_all_sorted); | ||