diff options
author | beck <> | 2024-04-10 14:51:02 +0000 |
---|---|---|
committer | beck <> | 2024-04-10 14:51:02 +0000 |
commit | 28391ee6892093e7875a30c2bc0924a7bbcb17ea (patch) | |
tree | 1de2e3788fdb529f8ab9454147625167504e92c8 /src/lib/libcrypto/cryptlib.c | |
parent | dd303cf95a55e7ed2d56234a22f99bc1f0e08dfe (diff) | |
download | openbsd-28391ee6892093e7875a30c2bc0924a7bbcb17ea.tar.gz openbsd-28391ee6892093e7875a30c2bc0924a7bbcb17ea.tar.bz2 openbsd-28391ee6892093e7875a30c2bc0924a7bbcb17ea.zip |
Finish Hiding symbols in crypto.h
crypto.h already had the symbols not hidden behind LIBRESSL_INTERNAL
hidden - This now picks up the reset of them marking them as
LCRYPTO_UNUSED, and removes the LIBRESSL_INTERNAL guard.
These symbols will now be hidden, but if we use them inside
the library in a namespaced build we will get a deprecation
warning. use outside the library will be as with any other hidden
symbol, so fine.
ok tb@
Diffstat (limited to 'src/lib/libcrypto/cryptlib.c')
-rw-r--r-- | src/lib/libcrypto/cryptlib.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c index 9eef0348eb..ae3df35f52 100644 --- a/src/lib/libcrypto/cryptlib.c +++ b/src/lib/libcrypto/cryptlib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cryptlib.c,v 1.49 2024/03/24 06:48:03 tb Exp $ */ | 1 | /* $OpenBSD: cryptlib.c,v 1.50 2024/04/10 14:51:02 beck Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -136,24 +136,28 @@ CRYPTO_num_locks(void) | |||
136 | { | 136 | { |
137 | return 1; | 137 | return 1; |
138 | } | 138 | } |
139 | LCRYPTO_ALIAS(CRYPTO_num_locks); | ||
139 | 140 | ||
140 | unsigned long | 141 | unsigned long |
141 | (*CRYPTO_get_id_callback(void))(void) | 142 | (*CRYPTO_get_id_callback(void))(void) |
142 | { | 143 | { |
143 | return NULL; | 144 | return NULL; |
144 | } | 145 | } |
146 | LCRYPTO_ALIAS(CRYPTO_get_id_callback); | ||
145 | 147 | ||
146 | void | 148 | void |
147 | CRYPTO_set_id_callback(unsigned long (*func)(void)) | 149 | CRYPTO_set_id_callback(unsigned long (*func)(void)) |
148 | { | 150 | { |
149 | return; | 151 | return; |
150 | } | 152 | } |
153 | LCRYPTO_ALIAS(CRYPTO_set_id_callback); | ||
151 | 154 | ||
152 | unsigned long | 155 | unsigned long |
153 | CRYPTO_thread_id(void) | 156 | CRYPTO_thread_id(void) |
154 | { | 157 | { |
155 | return (unsigned long)pthread_self(); | 158 | return (unsigned long)pthread_self(); |
156 | } | 159 | } |
160 | LCRYPTO_ALIAS(CRYPTO_thread_id); | ||
157 | 161 | ||
158 | void | 162 | void |
159 | CRYPTO_set_locking_callback(void (*func)(int mode, int lock_num, | 163 | CRYPTO_set_locking_callback(void (*func)(int mode, int lock_num, |
@@ -161,6 +165,7 @@ CRYPTO_set_locking_callback(void (*func)(int mode, int lock_num, | |||
161 | { | 165 | { |
162 | locking_callback = func; | 166 | locking_callback = func; |
163 | } | 167 | } |
168 | LCRYPTO_ALIAS(CRYPTO_set_locking_callback); | ||
164 | 169 | ||
165 | void | 170 | void |
166 | (*CRYPTO_get_locking_callback(void))(int mode, int lock_num, | 171 | (*CRYPTO_get_locking_callback(void))(int mode, int lock_num, |
@@ -168,6 +173,7 @@ void | |||
168 | { | 173 | { |
169 | return locking_callback; | 174 | return locking_callback; |
170 | } | 175 | } |
176 | LCRYPTO_ALIAS(CRYPTO_get_locking_callback); | ||
171 | 177 | ||
172 | void | 178 | void |
173 | CRYPTO_set_add_lock_callback(int (*func)(int *num, int mount, int lock_num, | 179 | CRYPTO_set_add_lock_callback(int (*func)(int *num, int mount, int lock_num, |
@@ -175,6 +181,7 @@ CRYPTO_set_add_lock_callback(int (*func)(int *num, int mount, int lock_num, | |||
175 | { | 181 | { |
176 | add_lock_callback = func; | 182 | add_lock_callback = func; |
177 | } | 183 | } |
184 | LCRYPTO_ALIAS(CRYPTO_set_add_lock_callback); | ||
178 | 185 | ||
179 | int | 186 | int |
180 | (*CRYPTO_get_add_lock_callback(void))(int *num, int mount, int type, | 187 | (*CRYPTO_get_add_lock_callback(void))(int *num, int mount, int type, |
@@ -182,58 +189,68 @@ int | |||
182 | { | 189 | { |
183 | return add_lock_callback; | 190 | return add_lock_callback; |
184 | } | 191 | } |
192 | LCRYPTO_ALIAS(CRYPTO_get_add_lock_callback); | ||
185 | 193 | ||
186 | const char * | 194 | const char * |
187 | CRYPTO_get_lock_name(int lock_num) | 195 | CRYPTO_get_lock_name(int lock_num) |
188 | { | 196 | { |
189 | return ""; | 197 | return ""; |
190 | } | 198 | } |
199 | LCRYPTO_ALIAS(CRYPTO_get_lock_name); | ||
191 | 200 | ||
192 | struct CRYPTO_dynlock_value * | 201 | struct CRYPTO_dynlock_value * |
193 | CRYPTO_get_dynlock_value(int i) | 202 | CRYPTO_get_dynlock_value(int i) |
194 | { | 203 | { |
195 | return NULL; | 204 | return NULL; |
196 | } | 205 | } |
206 | LCRYPTO_ALIAS(CRYPTO_get_dynlock_value); | ||
197 | 207 | ||
198 | int CRYPTO_get_new_dynlockid(void) | 208 | int CRYPTO_get_new_dynlockid(void) |
199 | { | 209 | { |
200 | return 0; | 210 | return 0; |
201 | } | 211 | } |
212 | LCRYPTO_ALIAS(CRYPTO_get_new_dynlockid); | ||
202 | 213 | ||
203 | void | 214 | void |
204 | CRYPTO_destroy_dynlockid(int i) | 215 | CRYPTO_destroy_dynlockid(int i) |
205 | { | 216 | { |
206 | return; | 217 | return; |
207 | } | 218 | } |
219 | LCRYPTO_ALIAS(CRYPTO_destroy_dynlockid); | ||
208 | 220 | ||
209 | int CRYPTO_get_new_lockid(char *name) | 221 | int CRYPTO_get_new_lockid(char *name) |
210 | { | 222 | { |
211 | return 0; | 223 | return 0; |
212 | } | 224 | } |
225 | LCRYPTO_ALIAS(CRYPTO_get_new_lockid); | ||
213 | 226 | ||
214 | int | 227 | int |
215 | CRYPTO_THREADID_set_callback(void (*func)(CRYPTO_THREADID *)) | 228 | CRYPTO_THREADID_set_callback(void (*func)(CRYPTO_THREADID *)) |
216 | { | 229 | { |
217 | return 1; | 230 | return 1; |
218 | } | 231 | } |
232 | LCRYPTO_ALIAS(CRYPTO_THREADID_set_callback); | ||
219 | 233 | ||
220 | void | 234 | void |
221 | (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *) | 235 | (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *) |
222 | { | 236 | { |
223 | return NULL; | 237 | return NULL; |
224 | } | 238 | } |
239 | LCRYPTO_ALIAS(CRYPTO_THREADID_get_callback); | ||
225 | 240 | ||
226 | void | 241 | void |
227 | CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val) | 242 | CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val) |
228 | { | 243 | { |
229 | return; | 244 | return; |
230 | } | 245 | } |
246 | LCRYPTO_ALIAS(CRYPTO_THREADID_set_numeric); | ||
231 | 247 | ||
232 | void | 248 | void |
233 | CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr) | 249 | CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr) |
234 | { | 250 | { |
235 | return; | 251 | return; |
236 | } | 252 | } |
253 | LCRYPTO_ALIAS(CRYPTO_THREADID_set_pointer); | ||
237 | 254 | ||
238 | void | 255 | void |
239 | CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *( | 256 | CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *( |
@@ -241,6 +258,7 @@ CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *( | |||
241 | { | 258 | { |
242 | return; | 259 | return; |
243 | } | 260 | } |
261 | LCRYPTO_ALIAS(CRYPTO_set_dynlock_create_callback); | ||
244 | 262 | ||
245 | void | 263 | void |
246 | CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)( | 264 | CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)( |
@@ -248,6 +266,7 @@ CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)( | |||
248 | { | 266 | { |
249 | return; | 267 | return; |
250 | } | 268 | } |
269 | LCRYPTO_ALIAS(CRYPTO_set_dynlock_lock_callback); | ||
251 | 270 | ||
252 | void | 271 | void |
253 | CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)( | 272 | CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)( |
@@ -255,6 +274,7 @@ CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)( | |||
255 | { | 274 | { |
256 | return; | 275 | return; |
257 | } | 276 | } |
277 | LCRYPTO_ALIAS(CRYPTO_set_dynlock_destroy_callback); | ||
258 | 278 | ||
259 | struct CRYPTO_dynlock_value * | 279 | struct CRYPTO_dynlock_value * |
260 | (*CRYPTO_get_dynlock_create_callback(void))( | 280 | (*CRYPTO_get_dynlock_create_callback(void))( |
@@ -269,6 +289,7 @@ void | |||
269 | { | 289 | { |
270 | return NULL; | 290 | return NULL; |
271 | } | 291 | } |
292 | LCRYPTO_ALIAS(CRYPTO_get_dynlock_lock_callback); | ||
272 | 293 | ||
273 | void | 294 | void |
274 | (*CRYPTO_get_dynlock_destroy_callback(void))( | 295 | (*CRYPTO_get_dynlock_destroy_callback(void))( |
@@ -276,6 +297,7 @@ void | |||
276 | { | 297 | { |
277 | return NULL; | 298 | return NULL; |
278 | } | 299 | } |
300 | LCRYPTO_ALIAS(CRYPTO_get_dynlock_destroy_callback); | ||
279 | 301 | ||
280 | void | 302 | void |
281 | CRYPTO_THREADID_current(CRYPTO_THREADID *id) | 303 | CRYPTO_THREADID_current(CRYPTO_THREADID *id) |
@@ -380,3 +402,4 @@ CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len) | |||
380 | 402 | ||
381 | return x; | 403 | return x; |
382 | } | 404 | } |
405 | LCRYPTO_ALIAS(CRYPTO_memcmp); | ||