diff options
Diffstat (limited to 'src/lib/libcrypto/stack/stack.c')
-rw-r--r-- | src/lib/libcrypto/stack/stack.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/lib/libcrypto/stack/stack.c b/src/lib/libcrypto/stack/stack.c index c99941aa46..bc5b2f6e83 100644 --- a/src/lib/libcrypto/stack/stack.c +++ b/src/lib/libcrypto/stack/stack.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: stack.c,v 1.21 2022/11/11 19:18:55 beck Exp $ */ | 1 | /* $OpenBSD: stack.c,v 1.22 2023/02/16 08:38:17 tb 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 | * |
@@ -79,7 +79,7 @@ int | |||
79 | 79 | ||
80 | return old; | 80 | return old; |
81 | } | 81 | } |
82 | LCRYPTO_ALIAS(sk_set_cmp_func) | 82 | LCRYPTO_ALIAS(sk_set_cmp_func); |
83 | 83 | ||
84 | _STACK * | 84 | _STACK * |
85 | sk_dup(_STACK *sk) | 85 | sk_dup(_STACK *sk) |
@@ -106,14 +106,14 @@ err: | |||
106 | sk_free(ret); | 106 | sk_free(ret); |
107 | return (NULL); | 107 | return (NULL); |
108 | } | 108 | } |
109 | LCRYPTO_ALIAS(sk_dup) | 109 | LCRYPTO_ALIAS(sk_dup); |
110 | 110 | ||
111 | _STACK * | 111 | _STACK * |
112 | sk_new_null(void) | 112 | sk_new_null(void) |
113 | { | 113 | { |
114 | return sk_new((int (*)(const void *, const void *))0); | 114 | return sk_new((int (*)(const void *, const void *))0); |
115 | } | 115 | } |
116 | LCRYPTO_ALIAS(sk_new_null) | 116 | LCRYPTO_ALIAS(sk_new_null); |
117 | 117 | ||
118 | _STACK * | 118 | _STACK * |
119 | sk_new(int (*c)(const void *, const void *)) | 119 | sk_new(int (*c)(const void *, const void *)) |
@@ -137,7 +137,7 @@ err: | |||
137 | free(ret); | 137 | free(ret); |
138 | return (NULL); | 138 | return (NULL); |
139 | } | 139 | } |
140 | LCRYPTO_ALIAS(sk_new) | 140 | LCRYPTO_ALIAS(sk_new); |
141 | 141 | ||
142 | int | 142 | int |
143 | sk_insert(_STACK *st, void *data, int loc) | 143 | sk_insert(_STACK *st, void *data, int loc) |
@@ -164,7 +164,7 @@ sk_insert(_STACK *st, void *data, int loc) | |||
164 | st->sorted = 0; | 164 | st->sorted = 0; |
165 | return (st->num); | 165 | return (st->num); |
166 | } | 166 | } |
167 | LCRYPTO_ALIAS(sk_insert) | 167 | LCRYPTO_ALIAS(sk_insert); |
168 | 168 | ||
169 | void * | 169 | void * |
170 | sk_delete_ptr(_STACK *st, void *p) | 170 | sk_delete_ptr(_STACK *st, void *p) |
@@ -176,7 +176,7 @@ sk_delete_ptr(_STACK *st, void *p) | |||
176 | return (sk_delete(st, i)); | 176 | return (sk_delete(st, i)); |
177 | return (NULL); | 177 | return (NULL); |
178 | } | 178 | } |
179 | LCRYPTO_ALIAS(sk_delete_ptr) | 179 | LCRYPTO_ALIAS(sk_delete_ptr); |
180 | 180 | ||
181 | void * | 181 | void * |
182 | sk_delete(_STACK *st, int loc) | 182 | sk_delete(_STACK *st, int loc) |
@@ -194,7 +194,7 @@ sk_delete(_STACK *st, int loc) | |||
194 | st->num--; | 194 | st->num--; |
195 | return (ret); | 195 | return (ret); |
196 | } | 196 | } |
197 | LCRYPTO_ALIAS(sk_delete) | 197 | LCRYPTO_ALIAS(sk_delete); |
198 | 198 | ||
199 | static int | 199 | static int |
200 | internal_find(_STACK *st, void *data, int ret_val_options) | 200 | internal_find(_STACK *st, void *data, int ret_val_options) |
@@ -226,28 +226,28 @@ sk_find(_STACK *st, void *data) | |||
226 | { | 226 | { |
227 | return internal_find(st, data, OBJ_BSEARCH_FIRST_VALUE_ON_MATCH); | 227 | return internal_find(st, data, OBJ_BSEARCH_FIRST_VALUE_ON_MATCH); |
228 | } | 228 | } |
229 | LCRYPTO_ALIAS(sk_find) | 229 | LCRYPTO_ALIAS(sk_find); |
230 | 230 | ||
231 | int | 231 | int |
232 | sk_find_ex(_STACK *st, void *data) | 232 | sk_find_ex(_STACK *st, void *data) |
233 | { | 233 | { |
234 | return internal_find(st, data, OBJ_BSEARCH_VALUE_ON_NOMATCH); | 234 | return internal_find(st, data, OBJ_BSEARCH_VALUE_ON_NOMATCH); |
235 | } | 235 | } |
236 | LCRYPTO_ALIAS(sk_find_ex) | 236 | LCRYPTO_ALIAS(sk_find_ex); |
237 | 237 | ||
238 | int | 238 | int |
239 | sk_push(_STACK *st, void *data) | 239 | sk_push(_STACK *st, void *data) |
240 | { | 240 | { |
241 | return (sk_insert(st, data, st->num)); | 241 | return (sk_insert(st, data, st->num)); |
242 | } | 242 | } |
243 | LCRYPTO_ALIAS(sk_push) | 243 | LCRYPTO_ALIAS(sk_push); |
244 | 244 | ||
245 | int | 245 | int |
246 | sk_unshift(_STACK *st, void *data) | 246 | sk_unshift(_STACK *st, void *data) |
247 | { | 247 | { |
248 | return (sk_insert(st, data, 0)); | 248 | return (sk_insert(st, data, 0)); |
249 | } | 249 | } |
250 | LCRYPTO_ALIAS(sk_unshift) | 250 | LCRYPTO_ALIAS(sk_unshift); |
251 | 251 | ||
252 | void * | 252 | void * |
253 | sk_shift(_STACK *st) | 253 | sk_shift(_STACK *st) |
@@ -258,7 +258,7 @@ sk_shift(_STACK *st) | |||
258 | return (NULL); | 258 | return (NULL); |
259 | return (sk_delete(st, 0)); | 259 | return (sk_delete(st, 0)); |
260 | } | 260 | } |
261 | LCRYPTO_ALIAS(sk_shift) | 261 | LCRYPTO_ALIAS(sk_shift); |
262 | 262 | ||
263 | void * | 263 | void * |
264 | sk_pop(_STACK *st) | 264 | sk_pop(_STACK *st) |
@@ -269,7 +269,7 @@ sk_pop(_STACK *st) | |||
269 | return (NULL); | 269 | return (NULL); |
270 | return (sk_delete(st, st->num - 1)); | 270 | return (sk_delete(st, st->num - 1)); |
271 | } | 271 | } |
272 | LCRYPTO_ALIAS(sk_pop) | 272 | LCRYPTO_ALIAS(sk_pop); |
273 | 273 | ||
274 | void | 274 | void |
275 | sk_zero(_STACK *st) | 275 | sk_zero(_STACK *st) |
@@ -281,7 +281,7 @@ sk_zero(_STACK *st) | |||
281 | memset(st->data, 0, sizeof(st->data)*st->num); | 281 | memset(st->data, 0, sizeof(st->data)*st->num); |
282 | st->num = 0; | 282 | st->num = 0; |
283 | } | 283 | } |
284 | LCRYPTO_ALIAS(sk_zero) | 284 | LCRYPTO_ALIAS(sk_zero); |
285 | 285 | ||
286 | void | 286 | void |
287 | sk_pop_free(_STACK *st, void (*func)(void *)) | 287 | sk_pop_free(_STACK *st, void (*func)(void *)) |
@@ -295,7 +295,7 @@ sk_pop_free(_STACK *st, void (*func)(void *)) | |||
295 | func(st->data[i]); | 295 | func(st->data[i]); |
296 | sk_free(st); | 296 | sk_free(st); |
297 | } | 297 | } |
298 | LCRYPTO_ALIAS(sk_pop_free) | 298 | LCRYPTO_ALIAS(sk_pop_free); |
299 | 299 | ||
300 | void | 300 | void |
301 | sk_free(_STACK *st) | 301 | sk_free(_STACK *st) |
@@ -305,7 +305,7 @@ sk_free(_STACK *st) | |||
305 | free(st->data); | 305 | free(st->data); |
306 | free(st); | 306 | free(st); |
307 | } | 307 | } |
308 | LCRYPTO_ALIAS(sk_free) | 308 | LCRYPTO_ALIAS(sk_free); |
309 | 309 | ||
310 | int | 310 | int |
311 | sk_num(const _STACK *st) | 311 | sk_num(const _STACK *st) |
@@ -314,7 +314,7 @@ sk_num(const _STACK *st) | |||
314 | return -1; | 314 | return -1; |
315 | return st->num; | 315 | return st->num; |
316 | } | 316 | } |
317 | LCRYPTO_ALIAS(sk_num) | 317 | LCRYPTO_ALIAS(sk_num); |
318 | 318 | ||
319 | void * | 319 | void * |
320 | sk_value(const _STACK *st, int i) | 320 | sk_value(const _STACK *st, int i) |
@@ -323,7 +323,7 @@ sk_value(const _STACK *st, int i) | |||
323 | return NULL; | 323 | return NULL; |
324 | return st->data[i]; | 324 | return st->data[i]; |
325 | } | 325 | } |
326 | LCRYPTO_ALIAS(sk_value) | 326 | LCRYPTO_ALIAS(sk_value); |
327 | 327 | ||
328 | void * | 328 | void * |
329 | sk_set(_STACK *st, int i, void *value) | 329 | sk_set(_STACK *st, int i, void *value) |
@@ -333,7 +333,7 @@ sk_set(_STACK *st, int i, void *value) | |||
333 | st->sorted = 0; | 333 | st->sorted = 0; |
334 | return (st->data[i] = value); | 334 | return (st->data[i] = value); |
335 | } | 335 | } |
336 | LCRYPTO_ALIAS(sk_set) | 336 | LCRYPTO_ALIAS(sk_set); |
337 | 337 | ||
338 | void | 338 | void |
339 | sk_sort(_STACK *st) | 339 | sk_sort(_STACK *st) |
@@ -351,7 +351,7 @@ sk_sort(_STACK *st) | |||
351 | st->sorted = 1; | 351 | st->sorted = 1; |
352 | } | 352 | } |
353 | } | 353 | } |
354 | LCRYPTO_ALIAS(sk_sort) | 354 | LCRYPTO_ALIAS(sk_sort); |
355 | 355 | ||
356 | int | 356 | int |
357 | sk_is_sorted(const _STACK *st) | 357 | sk_is_sorted(const _STACK *st) |
@@ -360,4 +360,4 @@ sk_is_sorted(const _STACK *st) | |||
360 | return 1; | 360 | return 1; |
361 | return st->sorted; | 361 | return st->sorted; |
362 | } | 362 | } |
363 | LCRYPTO_ALIAS(sk_is_sorted) | 363 | LCRYPTO_ALIAS(sk_is_sorted); |