diff options
Diffstat (limited to 'src/lib/libcrypto/stack')
-rw-r--r-- | src/lib/libcrypto/stack/Makefile | 86 | ||||
-rw-r--r-- | src/lib/libcrypto/stack/Makefile.ssl | 88 | ||||
-rw-r--r-- | src/lib/libcrypto/stack/safestack.h | 59 | ||||
-rw-r--r-- | src/lib/libcrypto/stack/stack.c | 14 | ||||
-rw-r--r-- | src/lib/libcrypto/stack/stack.h | 1 |
5 files changed, 178 insertions, 70 deletions
diff --git a/src/lib/libcrypto/stack/Makefile b/src/lib/libcrypto/stack/Makefile new file mode 100644 index 0000000000..4d5199a000 --- /dev/null +++ b/src/lib/libcrypto/stack/Makefile | |||
@@ -0,0 +1,86 @@ | |||
1 | # | ||
2 | # SSLeay/crypto/stack/Makefile | ||
3 | # | ||
4 | |||
5 | DIR= stack | ||
6 | TOP= ../.. | ||
7 | CC= cc | ||
8 | INCLUDES= | ||
9 | CFLAG=-g | ||
10 | INSTALL_PREFIX= | ||
11 | OPENSSLDIR= /usr/local/ssl | ||
12 | INSTALLTOP=/usr/local/ssl | ||
13 | MAKEDEPPROG= makedepend | ||
14 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
15 | MAKEFILE= Makefile | ||
16 | AR= ar r | ||
17 | |||
18 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
19 | |||
20 | GENERAL=Makefile | ||
21 | TEST= | ||
22 | APPS= | ||
23 | |||
24 | LIB=$(TOP)/libcrypto.a | ||
25 | LIBSRC=stack.c | ||
26 | LIBOBJ=stack.o | ||
27 | |||
28 | SRC= $(LIBSRC) | ||
29 | |||
30 | EXHEADER= stack.h safestack.h | ||
31 | HEADER= $(EXHEADER) | ||
32 | |||
33 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
34 | |||
35 | top: | ||
36 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
37 | |||
38 | all: lib | ||
39 | |||
40 | lib: $(LIBOBJ) | ||
41 | $(AR) $(LIB) $(LIBOBJ) | ||
42 | $(RANLIB) $(LIB) || echo Never mind. | ||
43 | @touch lib | ||
44 | |||
45 | files: | ||
46 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO | ||
47 | |||
48 | links: | ||
49 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
50 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
51 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
52 | |||
53 | install: | ||
54 | @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ | ||
55 | do \ | ||
56 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
57 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
58 | done; | ||
59 | |||
60 | tags: | ||
61 | ctags $(SRC) | ||
62 | |||
63 | tests: | ||
64 | |||
65 | lint: | ||
66 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
67 | |||
68 | depend: | ||
69 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
70 | |||
71 | dclean: | ||
72 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
73 | mv -f Makefile.new $(MAKEFILE) | ||
74 | |||
75 | clean: | ||
76 | rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
77 | |||
78 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
79 | |||
80 | stack.o: ../../e_os.h ../../include/openssl/bio.h | ||
81 | stack.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
82 | stack.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
83 | stack.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | ||
84 | stack.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
85 | stack.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
86 | stack.o: ../cryptlib.h stack.c | ||
diff --git a/src/lib/libcrypto/stack/Makefile.ssl b/src/lib/libcrypto/stack/Makefile.ssl new file mode 100644 index 0000000000..7120fb804a --- /dev/null +++ b/src/lib/libcrypto/stack/Makefile.ssl | |||
@@ -0,0 +1,88 @@ | |||
1 | # | ||
2 | # SSLeay/crypto/stack/Makefile | ||
3 | # | ||
4 | |||
5 | DIR= stack | ||
6 | TOP= ../.. | ||
7 | CC= cc | ||
8 | INCLUDES= | ||
9 | CFLAG=-g | ||
10 | INSTALL_PREFIX= | ||
11 | OPENSSLDIR= /usr/local/ssl | ||
12 | INSTALLTOP=/usr/local/ssl | ||
13 | MAKE= make -f Makefile.ssl | ||
14 | MAKEDEPPROG= makedepend | ||
15 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
16 | MAKEFILE= Makefile.ssl | ||
17 | AR= ar r | ||
18 | |||
19 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
20 | |||
21 | GENERAL=Makefile | ||
22 | TEST= | ||
23 | APPS= | ||
24 | |||
25 | LIB=$(TOP)/libcrypto.a | ||
26 | LIBSRC=stack.c | ||
27 | LIBOBJ=stack.o | ||
28 | |||
29 | SRC= $(LIBSRC) | ||
30 | |||
31 | EXHEADER= stack.h safestack.h | ||
32 | HEADER= $(EXHEADER) | ||
33 | |||
34 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
35 | |||
36 | top: | ||
37 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
38 | |||
39 | all: lib | ||
40 | |||
41 | lib: $(LIBOBJ) | ||
42 | $(AR) $(LIB) $(LIBOBJ) | ||
43 | $(RANLIB) $(LIB) || echo Never mind. | ||
44 | @touch lib | ||
45 | |||
46 | files: | ||
47 | $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO | ||
48 | |||
49 | links: | ||
50 | @sh $(TOP)/util/point.sh Makefile.ssl Makefile | ||
51 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
52 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
53 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
54 | |||
55 | install: | ||
56 | @for i in $(EXHEADER) ; \ | ||
57 | do \ | ||
58 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
59 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
60 | done; | ||
61 | |||
62 | tags: | ||
63 | ctags $(SRC) | ||
64 | |||
65 | tests: | ||
66 | |||
67 | lint: | ||
68 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
69 | |||
70 | depend: | ||
71 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
72 | |||
73 | dclean: | ||
74 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
75 | mv -f Makefile.new $(MAKEFILE) | ||
76 | |||
77 | clean: | ||
78 | rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
79 | |||
80 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
81 | |||
82 | stack.o: ../../e_os.h ../../include/openssl/bio.h | ||
83 | stack.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
84 | stack.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
85 | stack.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | ||
86 | stack.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
87 | stack.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
88 | stack.o: ../cryptlib.h stack.c | ||
diff --git a/src/lib/libcrypto/stack/safestack.h b/src/lib/libcrypto/stack/safestack.h index bd1121c279..ed9ed2c23a 100644 --- a/src/lib/libcrypto/stack/safestack.h +++ b/src/lib/libcrypto/stack/safestack.h | |||
@@ -113,8 +113,6 @@ STACK_OF(type) \ | |||
113 | ((type * (*)(STACK_OF(type) *))sk_pop)(st) | 113 | ((type * (*)(STACK_OF(type) *))sk_pop)(st) |
114 | #define SKM_sk_sort(type, st) \ | 114 | #define SKM_sk_sort(type, st) \ |
115 | ((void (*)(STACK_OF(type) *))sk_sort)(st) | 115 | ((void (*)(STACK_OF(type) *))sk_sort)(st) |
116 | #define SKM_sk_is_sorted(type, st) \ | ||
117 | ((int (*)(const STACK_OF(type) *))sk_is_sorted)(st) | ||
118 | 116 | ||
119 | #define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ | 117 | #define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ |
120 | ((STACK_OF(type) * (*) (STACK_OF(type) **,unsigned char **, long , \ | 118 | ((STACK_OF(type) * (*) (STACK_OF(type) **,unsigned char **, long , \ |
@@ -189,8 +187,6 @@ STACK_OF(type) \ | |||
189 | ((type *)sk_pop(st)) | 187 | ((type *)sk_pop(st)) |
190 | #define SKM_sk_sort(type, st) \ | 188 | #define SKM_sk_sort(type, st) \ |
191 | sk_sort(st) | 189 | sk_sort(st) |
192 | #define SKM_sk_is_sorted(type, st) \ | ||
193 | sk_is_sorted(st) | ||
194 | 190 | ||
195 | #define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ | 191 | #define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ |
196 | d2i_ASN1_SET(st,pp,length, (char *(*)())d2i_func, (void (*)(void *))free_func, ex_tag,ex_class) | 192 | d2i_ASN1_SET(st,pp,length, (char *(*)())d2i_func, (void (*)(void *))free_func, ex_tag,ex_class) |
@@ -227,7 +223,6 @@ STACK_OF(type) \ | |||
227 | #define sk_ACCESS_DESCRIPTION_shift(st) SKM_sk_shift(ACCESS_DESCRIPTION, (st)) | 223 | #define sk_ACCESS_DESCRIPTION_shift(st) SKM_sk_shift(ACCESS_DESCRIPTION, (st)) |
228 | #define sk_ACCESS_DESCRIPTION_pop(st) SKM_sk_pop(ACCESS_DESCRIPTION, (st)) | 224 | #define sk_ACCESS_DESCRIPTION_pop(st) SKM_sk_pop(ACCESS_DESCRIPTION, (st)) |
229 | #define sk_ACCESS_DESCRIPTION_sort(st) SKM_sk_sort(ACCESS_DESCRIPTION, (st)) | 225 | #define sk_ACCESS_DESCRIPTION_sort(st) SKM_sk_sort(ACCESS_DESCRIPTION, (st)) |
230 | #define sk_ACCESS_DESCRIPTION_is_sorted(st) SKM_sk_is_sorted(ACCESS_DESCRIPTION, (st)) | ||
231 | 226 | ||
232 | #define sk_ASN1_GENERALSTRING_new(st) SKM_sk_new(ASN1_GENERALSTRING, (st)) | 227 | #define sk_ASN1_GENERALSTRING_new(st) SKM_sk_new(ASN1_GENERALSTRING, (st)) |
233 | #define sk_ASN1_GENERALSTRING_new_null() SKM_sk_new_null(ASN1_GENERALSTRING) | 228 | #define sk_ASN1_GENERALSTRING_new_null() SKM_sk_new_null(ASN1_GENERALSTRING) |
@@ -248,7 +243,6 @@ STACK_OF(type) \ | |||
248 | #define sk_ASN1_GENERALSTRING_shift(st) SKM_sk_shift(ASN1_GENERALSTRING, (st)) | 243 | #define sk_ASN1_GENERALSTRING_shift(st) SKM_sk_shift(ASN1_GENERALSTRING, (st)) |
249 | #define sk_ASN1_GENERALSTRING_pop(st) SKM_sk_pop(ASN1_GENERALSTRING, (st)) | 244 | #define sk_ASN1_GENERALSTRING_pop(st) SKM_sk_pop(ASN1_GENERALSTRING, (st)) |
250 | #define sk_ASN1_GENERALSTRING_sort(st) SKM_sk_sort(ASN1_GENERALSTRING, (st)) | 245 | #define sk_ASN1_GENERALSTRING_sort(st) SKM_sk_sort(ASN1_GENERALSTRING, (st)) |
251 | #define sk_ASN1_GENERALSTRING_is_sorted(st) SKM_sk_is_sorted(ASN1_GENERALSTRING, (st)) | ||
252 | 246 | ||
253 | #define sk_ASN1_INTEGER_new(st) SKM_sk_new(ASN1_INTEGER, (st)) | 247 | #define sk_ASN1_INTEGER_new(st) SKM_sk_new(ASN1_INTEGER, (st)) |
254 | #define sk_ASN1_INTEGER_new_null() SKM_sk_new_null(ASN1_INTEGER) | 248 | #define sk_ASN1_INTEGER_new_null() SKM_sk_new_null(ASN1_INTEGER) |
@@ -269,7 +263,6 @@ STACK_OF(type) \ | |||
269 | #define sk_ASN1_INTEGER_shift(st) SKM_sk_shift(ASN1_INTEGER, (st)) | 263 | #define sk_ASN1_INTEGER_shift(st) SKM_sk_shift(ASN1_INTEGER, (st)) |
270 | #define sk_ASN1_INTEGER_pop(st) SKM_sk_pop(ASN1_INTEGER, (st)) | 264 | #define sk_ASN1_INTEGER_pop(st) SKM_sk_pop(ASN1_INTEGER, (st)) |
271 | #define sk_ASN1_INTEGER_sort(st) SKM_sk_sort(ASN1_INTEGER, (st)) | 265 | #define sk_ASN1_INTEGER_sort(st) SKM_sk_sort(ASN1_INTEGER, (st)) |
272 | #define sk_ASN1_INTEGER_is_sorted(st) SKM_sk_is_sorted(ASN1_INTEGER, (st)) | ||
273 | 266 | ||
274 | #define sk_ASN1_OBJECT_new(st) SKM_sk_new(ASN1_OBJECT, (st)) | 267 | #define sk_ASN1_OBJECT_new(st) SKM_sk_new(ASN1_OBJECT, (st)) |
275 | #define sk_ASN1_OBJECT_new_null() SKM_sk_new_null(ASN1_OBJECT) | 268 | #define sk_ASN1_OBJECT_new_null() SKM_sk_new_null(ASN1_OBJECT) |
@@ -290,7 +283,6 @@ STACK_OF(type) \ | |||
290 | #define sk_ASN1_OBJECT_shift(st) SKM_sk_shift(ASN1_OBJECT, (st)) | 283 | #define sk_ASN1_OBJECT_shift(st) SKM_sk_shift(ASN1_OBJECT, (st)) |
291 | #define sk_ASN1_OBJECT_pop(st) SKM_sk_pop(ASN1_OBJECT, (st)) | 284 | #define sk_ASN1_OBJECT_pop(st) SKM_sk_pop(ASN1_OBJECT, (st)) |
292 | #define sk_ASN1_OBJECT_sort(st) SKM_sk_sort(ASN1_OBJECT, (st)) | 285 | #define sk_ASN1_OBJECT_sort(st) SKM_sk_sort(ASN1_OBJECT, (st)) |
293 | #define sk_ASN1_OBJECT_is_sorted(st) SKM_sk_is_sorted(ASN1_OBJECT, (st)) | ||
294 | 286 | ||
295 | #define sk_ASN1_STRING_TABLE_new(st) SKM_sk_new(ASN1_STRING_TABLE, (st)) | 287 | #define sk_ASN1_STRING_TABLE_new(st) SKM_sk_new(ASN1_STRING_TABLE, (st)) |
296 | #define sk_ASN1_STRING_TABLE_new_null() SKM_sk_new_null(ASN1_STRING_TABLE) | 288 | #define sk_ASN1_STRING_TABLE_new_null() SKM_sk_new_null(ASN1_STRING_TABLE) |
@@ -311,7 +303,6 @@ STACK_OF(type) \ | |||
311 | #define sk_ASN1_STRING_TABLE_shift(st) SKM_sk_shift(ASN1_STRING_TABLE, (st)) | 303 | #define sk_ASN1_STRING_TABLE_shift(st) SKM_sk_shift(ASN1_STRING_TABLE, (st)) |
312 | #define sk_ASN1_STRING_TABLE_pop(st) SKM_sk_pop(ASN1_STRING_TABLE, (st)) | 304 | #define sk_ASN1_STRING_TABLE_pop(st) SKM_sk_pop(ASN1_STRING_TABLE, (st)) |
313 | #define sk_ASN1_STRING_TABLE_sort(st) SKM_sk_sort(ASN1_STRING_TABLE, (st)) | 305 | #define sk_ASN1_STRING_TABLE_sort(st) SKM_sk_sort(ASN1_STRING_TABLE, (st)) |
314 | #define sk_ASN1_STRING_TABLE_is_sorted(st) SKM_sk_is_sorted(ASN1_STRING_TABLE, (st)) | ||
315 | 306 | ||
316 | #define sk_ASN1_TYPE_new(st) SKM_sk_new(ASN1_TYPE, (st)) | 307 | #define sk_ASN1_TYPE_new(st) SKM_sk_new(ASN1_TYPE, (st)) |
317 | #define sk_ASN1_TYPE_new_null() SKM_sk_new_null(ASN1_TYPE) | 308 | #define sk_ASN1_TYPE_new_null() SKM_sk_new_null(ASN1_TYPE) |
@@ -332,7 +323,6 @@ STACK_OF(type) \ | |||
332 | #define sk_ASN1_TYPE_shift(st) SKM_sk_shift(ASN1_TYPE, (st)) | 323 | #define sk_ASN1_TYPE_shift(st) SKM_sk_shift(ASN1_TYPE, (st)) |
333 | #define sk_ASN1_TYPE_pop(st) SKM_sk_pop(ASN1_TYPE, (st)) | 324 | #define sk_ASN1_TYPE_pop(st) SKM_sk_pop(ASN1_TYPE, (st)) |
334 | #define sk_ASN1_TYPE_sort(st) SKM_sk_sort(ASN1_TYPE, (st)) | 325 | #define sk_ASN1_TYPE_sort(st) SKM_sk_sort(ASN1_TYPE, (st)) |
335 | #define sk_ASN1_TYPE_is_sorted(st) SKM_sk_is_sorted(ASN1_TYPE, (st)) | ||
336 | 326 | ||
337 | #define sk_ASN1_VALUE_new(st) SKM_sk_new(ASN1_VALUE, (st)) | 327 | #define sk_ASN1_VALUE_new(st) SKM_sk_new(ASN1_VALUE, (st)) |
338 | #define sk_ASN1_VALUE_new_null() SKM_sk_new_null(ASN1_VALUE) | 328 | #define sk_ASN1_VALUE_new_null() SKM_sk_new_null(ASN1_VALUE) |
@@ -353,7 +343,6 @@ STACK_OF(type) \ | |||
353 | #define sk_ASN1_VALUE_shift(st) SKM_sk_shift(ASN1_VALUE, (st)) | 343 | #define sk_ASN1_VALUE_shift(st) SKM_sk_shift(ASN1_VALUE, (st)) |
354 | #define sk_ASN1_VALUE_pop(st) SKM_sk_pop(ASN1_VALUE, (st)) | 344 | #define sk_ASN1_VALUE_pop(st) SKM_sk_pop(ASN1_VALUE, (st)) |
355 | #define sk_ASN1_VALUE_sort(st) SKM_sk_sort(ASN1_VALUE, (st)) | 345 | #define sk_ASN1_VALUE_sort(st) SKM_sk_sort(ASN1_VALUE, (st)) |
356 | #define sk_ASN1_VALUE_is_sorted(st) SKM_sk_is_sorted(ASN1_VALUE, (st)) | ||
357 | 346 | ||
358 | #define sk_BIO_new(st) SKM_sk_new(BIO, (st)) | 347 | #define sk_BIO_new(st) SKM_sk_new(BIO, (st)) |
359 | #define sk_BIO_new_null() SKM_sk_new_null(BIO) | 348 | #define sk_BIO_new_null() SKM_sk_new_null(BIO) |
@@ -374,7 +363,6 @@ STACK_OF(type) \ | |||
374 | #define sk_BIO_shift(st) SKM_sk_shift(BIO, (st)) | 363 | #define sk_BIO_shift(st) SKM_sk_shift(BIO, (st)) |
375 | #define sk_BIO_pop(st) SKM_sk_pop(BIO, (st)) | 364 | #define sk_BIO_pop(st) SKM_sk_pop(BIO, (st)) |
376 | #define sk_BIO_sort(st) SKM_sk_sort(BIO, (st)) | 365 | #define sk_BIO_sort(st) SKM_sk_sort(BIO, (st)) |
377 | #define sk_BIO_is_sorted(st) SKM_sk_is_sorted(BIO, (st)) | ||
378 | 366 | ||
379 | #define sk_CONF_IMODULE_new(st) SKM_sk_new(CONF_IMODULE, (st)) | 367 | #define sk_CONF_IMODULE_new(st) SKM_sk_new(CONF_IMODULE, (st)) |
380 | #define sk_CONF_IMODULE_new_null() SKM_sk_new_null(CONF_IMODULE) | 368 | #define sk_CONF_IMODULE_new_null() SKM_sk_new_null(CONF_IMODULE) |
@@ -395,7 +383,6 @@ STACK_OF(type) \ | |||
395 | #define sk_CONF_IMODULE_shift(st) SKM_sk_shift(CONF_IMODULE, (st)) | 383 | #define sk_CONF_IMODULE_shift(st) SKM_sk_shift(CONF_IMODULE, (st)) |
396 | #define sk_CONF_IMODULE_pop(st) SKM_sk_pop(CONF_IMODULE, (st)) | 384 | #define sk_CONF_IMODULE_pop(st) SKM_sk_pop(CONF_IMODULE, (st)) |
397 | #define sk_CONF_IMODULE_sort(st) SKM_sk_sort(CONF_IMODULE, (st)) | 385 | #define sk_CONF_IMODULE_sort(st) SKM_sk_sort(CONF_IMODULE, (st)) |
398 | #define sk_CONF_IMODULE_is_sorted(st) SKM_sk_is_sorted(CONF_IMODULE, (st)) | ||
399 | 386 | ||
400 | #define sk_CONF_MODULE_new(st) SKM_sk_new(CONF_MODULE, (st)) | 387 | #define sk_CONF_MODULE_new(st) SKM_sk_new(CONF_MODULE, (st)) |
401 | #define sk_CONF_MODULE_new_null() SKM_sk_new_null(CONF_MODULE) | 388 | #define sk_CONF_MODULE_new_null() SKM_sk_new_null(CONF_MODULE) |
@@ -416,7 +403,6 @@ STACK_OF(type) \ | |||
416 | #define sk_CONF_MODULE_shift(st) SKM_sk_shift(CONF_MODULE, (st)) | 403 | #define sk_CONF_MODULE_shift(st) SKM_sk_shift(CONF_MODULE, (st)) |
417 | #define sk_CONF_MODULE_pop(st) SKM_sk_pop(CONF_MODULE, (st)) | 404 | #define sk_CONF_MODULE_pop(st) SKM_sk_pop(CONF_MODULE, (st)) |
418 | #define sk_CONF_MODULE_sort(st) SKM_sk_sort(CONF_MODULE, (st)) | 405 | #define sk_CONF_MODULE_sort(st) SKM_sk_sort(CONF_MODULE, (st)) |
419 | #define sk_CONF_MODULE_is_sorted(st) SKM_sk_is_sorted(CONF_MODULE, (st)) | ||
420 | 406 | ||
421 | #define sk_CONF_VALUE_new(st) SKM_sk_new(CONF_VALUE, (st)) | 407 | #define sk_CONF_VALUE_new(st) SKM_sk_new(CONF_VALUE, (st)) |
422 | #define sk_CONF_VALUE_new_null() SKM_sk_new_null(CONF_VALUE) | 408 | #define sk_CONF_VALUE_new_null() SKM_sk_new_null(CONF_VALUE) |
@@ -437,7 +423,6 @@ STACK_OF(type) \ | |||
437 | #define sk_CONF_VALUE_shift(st) SKM_sk_shift(CONF_VALUE, (st)) | 423 | #define sk_CONF_VALUE_shift(st) SKM_sk_shift(CONF_VALUE, (st)) |
438 | #define sk_CONF_VALUE_pop(st) SKM_sk_pop(CONF_VALUE, (st)) | 424 | #define sk_CONF_VALUE_pop(st) SKM_sk_pop(CONF_VALUE, (st)) |
439 | #define sk_CONF_VALUE_sort(st) SKM_sk_sort(CONF_VALUE, (st)) | 425 | #define sk_CONF_VALUE_sort(st) SKM_sk_sort(CONF_VALUE, (st)) |
440 | #define sk_CONF_VALUE_is_sorted(st) SKM_sk_is_sorted(CONF_VALUE, (st)) | ||
441 | 426 | ||
442 | #define sk_CRYPTO_EX_DATA_FUNCS_new(st) SKM_sk_new(CRYPTO_EX_DATA_FUNCS, (st)) | 427 | #define sk_CRYPTO_EX_DATA_FUNCS_new(st) SKM_sk_new(CRYPTO_EX_DATA_FUNCS, (st)) |
443 | #define sk_CRYPTO_EX_DATA_FUNCS_new_null() SKM_sk_new_null(CRYPTO_EX_DATA_FUNCS) | 428 | #define sk_CRYPTO_EX_DATA_FUNCS_new_null() SKM_sk_new_null(CRYPTO_EX_DATA_FUNCS) |
@@ -458,7 +443,6 @@ STACK_OF(type) \ | |||
458 | #define sk_CRYPTO_EX_DATA_FUNCS_shift(st) SKM_sk_shift(CRYPTO_EX_DATA_FUNCS, (st)) | 443 | #define sk_CRYPTO_EX_DATA_FUNCS_shift(st) SKM_sk_shift(CRYPTO_EX_DATA_FUNCS, (st)) |
459 | #define sk_CRYPTO_EX_DATA_FUNCS_pop(st) SKM_sk_pop(CRYPTO_EX_DATA_FUNCS, (st)) | 444 | #define sk_CRYPTO_EX_DATA_FUNCS_pop(st) SKM_sk_pop(CRYPTO_EX_DATA_FUNCS, (st)) |
460 | #define sk_CRYPTO_EX_DATA_FUNCS_sort(st) SKM_sk_sort(CRYPTO_EX_DATA_FUNCS, (st)) | 445 | #define sk_CRYPTO_EX_DATA_FUNCS_sort(st) SKM_sk_sort(CRYPTO_EX_DATA_FUNCS, (st)) |
461 | #define sk_CRYPTO_EX_DATA_FUNCS_is_sorted(st) SKM_sk_is_sorted(CRYPTO_EX_DATA_FUNCS, (st)) | ||
462 | 446 | ||
463 | #define sk_CRYPTO_dynlock_new(st) SKM_sk_new(CRYPTO_dynlock, (st)) | 447 | #define sk_CRYPTO_dynlock_new(st) SKM_sk_new(CRYPTO_dynlock, (st)) |
464 | #define sk_CRYPTO_dynlock_new_null() SKM_sk_new_null(CRYPTO_dynlock) | 448 | #define sk_CRYPTO_dynlock_new_null() SKM_sk_new_null(CRYPTO_dynlock) |
@@ -479,7 +463,6 @@ STACK_OF(type) \ | |||
479 | #define sk_CRYPTO_dynlock_shift(st) SKM_sk_shift(CRYPTO_dynlock, (st)) | 463 | #define sk_CRYPTO_dynlock_shift(st) SKM_sk_shift(CRYPTO_dynlock, (st)) |
480 | #define sk_CRYPTO_dynlock_pop(st) SKM_sk_pop(CRYPTO_dynlock, (st)) | 464 | #define sk_CRYPTO_dynlock_pop(st) SKM_sk_pop(CRYPTO_dynlock, (st)) |
481 | #define sk_CRYPTO_dynlock_sort(st) SKM_sk_sort(CRYPTO_dynlock, (st)) | 465 | #define sk_CRYPTO_dynlock_sort(st) SKM_sk_sort(CRYPTO_dynlock, (st)) |
482 | #define sk_CRYPTO_dynlock_is_sorted(st) SKM_sk_is_sorted(CRYPTO_dynlock, (st)) | ||
483 | 466 | ||
484 | #define sk_DIST_POINT_new(st) SKM_sk_new(DIST_POINT, (st)) | 467 | #define sk_DIST_POINT_new(st) SKM_sk_new(DIST_POINT, (st)) |
485 | #define sk_DIST_POINT_new_null() SKM_sk_new_null(DIST_POINT) | 468 | #define sk_DIST_POINT_new_null() SKM_sk_new_null(DIST_POINT) |
@@ -500,7 +483,6 @@ STACK_OF(type) \ | |||
500 | #define sk_DIST_POINT_shift(st) SKM_sk_shift(DIST_POINT, (st)) | 483 | #define sk_DIST_POINT_shift(st) SKM_sk_shift(DIST_POINT, (st)) |
501 | #define sk_DIST_POINT_pop(st) SKM_sk_pop(DIST_POINT, (st)) | 484 | #define sk_DIST_POINT_pop(st) SKM_sk_pop(DIST_POINT, (st)) |
502 | #define sk_DIST_POINT_sort(st) SKM_sk_sort(DIST_POINT, (st)) | 485 | #define sk_DIST_POINT_sort(st) SKM_sk_sort(DIST_POINT, (st)) |
503 | #define sk_DIST_POINT_is_sorted(st) SKM_sk_is_sorted(DIST_POINT, (st)) | ||
504 | 486 | ||
505 | #define sk_ENGINE_new(st) SKM_sk_new(ENGINE, (st)) | 487 | #define sk_ENGINE_new(st) SKM_sk_new(ENGINE, (st)) |
506 | #define sk_ENGINE_new_null() SKM_sk_new_null(ENGINE) | 488 | #define sk_ENGINE_new_null() SKM_sk_new_null(ENGINE) |
@@ -521,7 +503,6 @@ STACK_OF(type) \ | |||
521 | #define sk_ENGINE_shift(st) SKM_sk_shift(ENGINE, (st)) | 503 | #define sk_ENGINE_shift(st) SKM_sk_shift(ENGINE, (st)) |
522 | #define sk_ENGINE_pop(st) SKM_sk_pop(ENGINE, (st)) | 504 | #define sk_ENGINE_pop(st) SKM_sk_pop(ENGINE, (st)) |
523 | #define sk_ENGINE_sort(st) SKM_sk_sort(ENGINE, (st)) | 505 | #define sk_ENGINE_sort(st) SKM_sk_sort(ENGINE, (st)) |
524 | #define sk_ENGINE_is_sorted(st) SKM_sk_is_sorted(ENGINE, (st)) | ||
525 | 506 | ||
526 | #define sk_ENGINE_CLEANUP_ITEM_new(st) SKM_sk_new(ENGINE_CLEANUP_ITEM, (st)) | 507 | #define sk_ENGINE_CLEANUP_ITEM_new(st) SKM_sk_new(ENGINE_CLEANUP_ITEM, (st)) |
527 | #define sk_ENGINE_CLEANUP_ITEM_new_null() SKM_sk_new_null(ENGINE_CLEANUP_ITEM) | 508 | #define sk_ENGINE_CLEANUP_ITEM_new_null() SKM_sk_new_null(ENGINE_CLEANUP_ITEM) |
@@ -542,7 +523,6 @@ STACK_OF(type) \ | |||
542 | #define sk_ENGINE_CLEANUP_ITEM_shift(st) SKM_sk_shift(ENGINE_CLEANUP_ITEM, (st)) | 523 | #define sk_ENGINE_CLEANUP_ITEM_shift(st) SKM_sk_shift(ENGINE_CLEANUP_ITEM, (st)) |
543 | #define sk_ENGINE_CLEANUP_ITEM_pop(st) SKM_sk_pop(ENGINE_CLEANUP_ITEM, (st)) | 524 | #define sk_ENGINE_CLEANUP_ITEM_pop(st) SKM_sk_pop(ENGINE_CLEANUP_ITEM, (st)) |
544 | #define sk_ENGINE_CLEANUP_ITEM_sort(st) SKM_sk_sort(ENGINE_CLEANUP_ITEM, (st)) | 525 | #define sk_ENGINE_CLEANUP_ITEM_sort(st) SKM_sk_sort(ENGINE_CLEANUP_ITEM, (st)) |
545 | #define sk_ENGINE_CLEANUP_ITEM_is_sorted(st) SKM_sk_is_sorted(ENGINE_CLEANUP_ITEM, (st)) | ||
546 | 526 | ||
547 | #define sk_GENERAL_NAME_new(st) SKM_sk_new(GENERAL_NAME, (st)) | 527 | #define sk_GENERAL_NAME_new(st) SKM_sk_new(GENERAL_NAME, (st)) |
548 | #define sk_GENERAL_NAME_new_null() SKM_sk_new_null(GENERAL_NAME) | 528 | #define sk_GENERAL_NAME_new_null() SKM_sk_new_null(GENERAL_NAME) |
@@ -563,7 +543,6 @@ STACK_OF(type) \ | |||
563 | #define sk_GENERAL_NAME_shift(st) SKM_sk_shift(GENERAL_NAME, (st)) | 543 | #define sk_GENERAL_NAME_shift(st) SKM_sk_shift(GENERAL_NAME, (st)) |
564 | #define sk_GENERAL_NAME_pop(st) SKM_sk_pop(GENERAL_NAME, (st)) | 544 | #define sk_GENERAL_NAME_pop(st) SKM_sk_pop(GENERAL_NAME, (st)) |
565 | #define sk_GENERAL_NAME_sort(st) SKM_sk_sort(GENERAL_NAME, (st)) | 545 | #define sk_GENERAL_NAME_sort(st) SKM_sk_sort(GENERAL_NAME, (st)) |
566 | #define sk_GENERAL_NAME_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAME, (st)) | ||
567 | 546 | ||
568 | #define sk_KRB5_APREQBODY_new(st) SKM_sk_new(KRB5_APREQBODY, (st)) | 547 | #define sk_KRB5_APREQBODY_new(st) SKM_sk_new(KRB5_APREQBODY, (st)) |
569 | #define sk_KRB5_APREQBODY_new_null() SKM_sk_new_null(KRB5_APREQBODY) | 548 | #define sk_KRB5_APREQBODY_new_null() SKM_sk_new_null(KRB5_APREQBODY) |
@@ -584,7 +563,6 @@ STACK_OF(type) \ | |||
584 | #define sk_KRB5_APREQBODY_shift(st) SKM_sk_shift(KRB5_APREQBODY, (st)) | 563 | #define sk_KRB5_APREQBODY_shift(st) SKM_sk_shift(KRB5_APREQBODY, (st)) |
585 | #define sk_KRB5_APREQBODY_pop(st) SKM_sk_pop(KRB5_APREQBODY, (st)) | 564 | #define sk_KRB5_APREQBODY_pop(st) SKM_sk_pop(KRB5_APREQBODY, (st)) |
586 | #define sk_KRB5_APREQBODY_sort(st) SKM_sk_sort(KRB5_APREQBODY, (st)) | 565 | #define sk_KRB5_APREQBODY_sort(st) SKM_sk_sort(KRB5_APREQBODY, (st)) |
587 | #define sk_KRB5_APREQBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_APREQBODY, (st)) | ||
588 | 566 | ||
589 | #define sk_KRB5_AUTHDATA_new(st) SKM_sk_new(KRB5_AUTHDATA, (st)) | 567 | #define sk_KRB5_AUTHDATA_new(st) SKM_sk_new(KRB5_AUTHDATA, (st)) |
590 | #define sk_KRB5_AUTHDATA_new_null() SKM_sk_new_null(KRB5_AUTHDATA) | 568 | #define sk_KRB5_AUTHDATA_new_null() SKM_sk_new_null(KRB5_AUTHDATA) |
@@ -605,7 +583,6 @@ STACK_OF(type) \ | |||
605 | #define sk_KRB5_AUTHDATA_shift(st) SKM_sk_shift(KRB5_AUTHDATA, (st)) | 583 | #define sk_KRB5_AUTHDATA_shift(st) SKM_sk_shift(KRB5_AUTHDATA, (st)) |
606 | #define sk_KRB5_AUTHDATA_pop(st) SKM_sk_pop(KRB5_AUTHDATA, (st)) | 584 | #define sk_KRB5_AUTHDATA_pop(st) SKM_sk_pop(KRB5_AUTHDATA, (st)) |
607 | #define sk_KRB5_AUTHDATA_sort(st) SKM_sk_sort(KRB5_AUTHDATA, (st)) | 585 | #define sk_KRB5_AUTHDATA_sort(st) SKM_sk_sort(KRB5_AUTHDATA, (st)) |
608 | #define sk_KRB5_AUTHDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHDATA, (st)) | ||
609 | 586 | ||
610 | #define sk_KRB5_AUTHENTBODY_new(st) SKM_sk_new(KRB5_AUTHENTBODY, (st)) | 587 | #define sk_KRB5_AUTHENTBODY_new(st) SKM_sk_new(KRB5_AUTHENTBODY, (st)) |
611 | #define sk_KRB5_AUTHENTBODY_new_null() SKM_sk_new_null(KRB5_AUTHENTBODY) | 588 | #define sk_KRB5_AUTHENTBODY_new_null() SKM_sk_new_null(KRB5_AUTHENTBODY) |
@@ -626,7 +603,6 @@ STACK_OF(type) \ | |||
626 | #define sk_KRB5_AUTHENTBODY_shift(st) SKM_sk_shift(KRB5_AUTHENTBODY, (st)) | 603 | #define sk_KRB5_AUTHENTBODY_shift(st) SKM_sk_shift(KRB5_AUTHENTBODY, (st)) |
627 | #define sk_KRB5_AUTHENTBODY_pop(st) SKM_sk_pop(KRB5_AUTHENTBODY, (st)) | 604 | #define sk_KRB5_AUTHENTBODY_pop(st) SKM_sk_pop(KRB5_AUTHENTBODY, (st)) |
628 | #define sk_KRB5_AUTHENTBODY_sort(st) SKM_sk_sort(KRB5_AUTHENTBODY, (st)) | 605 | #define sk_KRB5_AUTHENTBODY_sort(st) SKM_sk_sort(KRB5_AUTHENTBODY, (st)) |
629 | #define sk_KRB5_AUTHENTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHENTBODY, (st)) | ||
630 | 606 | ||
631 | #define sk_KRB5_CHECKSUM_new(st) SKM_sk_new(KRB5_CHECKSUM, (st)) | 607 | #define sk_KRB5_CHECKSUM_new(st) SKM_sk_new(KRB5_CHECKSUM, (st)) |
632 | #define sk_KRB5_CHECKSUM_new_null() SKM_sk_new_null(KRB5_CHECKSUM) | 608 | #define sk_KRB5_CHECKSUM_new_null() SKM_sk_new_null(KRB5_CHECKSUM) |
@@ -647,7 +623,6 @@ STACK_OF(type) \ | |||
647 | #define sk_KRB5_CHECKSUM_shift(st) SKM_sk_shift(KRB5_CHECKSUM, (st)) | 623 | #define sk_KRB5_CHECKSUM_shift(st) SKM_sk_shift(KRB5_CHECKSUM, (st)) |
648 | #define sk_KRB5_CHECKSUM_pop(st) SKM_sk_pop(KRB5_CHECKSUM, (st)) | 624 | #define sk_KRB5_CHECKSUM_pop(st) SKM_sk_pop(KRB5_CHECKSUM, (st)) |
649 | #define sk_KRB5_CHECKSUM_sort(st) SKM_sk_sort(KRB5_CHECKSUM, (st)) | 625 | #define sk_KRB5_CHECKSUM_sort(st) SKM_sk_sort(KRB5_CHECKSUM, (st)) |
650 | #define sk_KRB5_CHECKSUM_is_sorted(st) SKM_sk_is_sorted(KRB5_CHECKSUM, (st)) | ||
651 | 626 | ||
652 | #define sk_KRB5_ENCDATA_new(st) SKM_sk_new(KRB5_ENCDATA, (st)) | 627 | #define sk_KRB5_ENCDATA_new(st) SKM_sk_new(KRB5_ENCDATA, (st)) |
653 | #define sk_KRB5_ENCDATA_new_null() SKM_sk_new_null(KRB5_ENCDATA) | 628 | #define sk_KRB5_ENCDATA_new_null() SKM_sk_new_null(KRB5_ENCDATA) |
@@ -668,7 +643,6 @@ STACK_OF(type) \ | |||
668 | #define sk_KRB5_ENCDATA_shift(st) SKM_sk_shift(KRB5_ENCDATA, (st)) | 643 | #define sk_KRB5_ENCDATA_shift(st) SKM_sk_shift(KRB5_ENCDATA, (st)) |
669 | #define sk_KRB5_ENCDATA_pop(st) SKM_sk_pop(KRB5_ENCDATA, (st)) | 644 | #define sk_KRB5_ENCDATA_pop(st) SKM_sk_pop(KRB5_ENCDATA, (st)) |
670 | #define sk_KRB5_ENCDATA_sort(st) SKM_sk_sort(KRB5_ENCDATA, (st)) | 645 | #define sk_KRB5_ENCDATA_sort(st) SKM_sk_sort(KRB5_ENCDATA, (st)) |
671 | #define sk_KRB5_ENCDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCDATA, (st)) | ||
672 | 646 | ||
673 | #define sk_KRB5_ENCKEY_new(st) SKM_sk_new(KRB5_ENCKEY, (st)) | 647 | #define sk_KRB5_ENCKEY_new(st) SKM_sk_new(KRB5_ENCKEY, (st)) |
674 | #define sk_KRB5_ENCKEY_new_null() SKM_sk_new_null(KRB5_ENCKEY) | 648 | #define sk_KRB5_ENCKEY_new_null() SKM_sk_new_null(KRB5_ENCKEY) |
@@ -689,7 +663,6 @@ STACK_OF(type) \ | |||
689 | #define sk_KRB5_ENCKEY_shift(st) SKM_sk_shift(KRB5_ENCKEY, (st)) | 663 | #define sk_KRB5_ENCKEY_shift(st) SKM_sk_shift(KRB5_ENCKEY, (st)) |
690 | #define sk_KRB5_ENCKEY_pop(st) SKM_sk_pop(KRB5_ENCKEY, (st)) | 664 | #define sk_KRB5_ENCKEY_pop(st) SKM_sk_pop(KRB5_ENCKEY, (st)) |
691 | #define sk_KRB5_ENCKEY_sort(st) SKM_sk_sort(KRB5_ENCKEY, (st)) | 665 | #define sk_KRB5_ENCKEY_sort(st) SKM_sk_sort(KRB5_ENCKEY, (st)) |
692 | #define sk_KRB5_ENCKEY_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCKEY, (st)) | ||
693 | 666 | ||
694 | #define sk_KRB5_PRINCNAME_new(st) SKM_sk_new(KRB5_PRINCNAME, (st)) | 667 | #define sk_KRB5_PRINCNAME_new(st) SKM_sk_new(KRB5_PRINCNAME, (st)) |
695 | #define sk_KRB5_PRINCNAME_new_null() SKM_sk_new_null(KRB5_PRINCNAME) | 668 | #define sk_KRB5_PRINCNAME_new_null() SKM_sk_new_null(KRB5_PRINCNAME) |
@@ -710,7 +683,6 @@ STACK_OF(type) \ | |||
710 | #define sk_KRB5_PRINCNAME_shift(st) SKM_sk_shift(KRB5_PRINCNAME, (st)) | 683 | #define sk_KRB5_PRINCNAME_shift(st) SKM_sk_shift(KRB5_PRINCNAME, (st)) |
711 | #define sk_KRB5_PRINCNAME_pop(st) SKM_sk_pop(KRB5_PRINCNAME, (st)) | 684 | #define sk_KRB5_PRINCNAME_pop(st) SKM_sk_pop(KRB5_PRINCNAME, (st)) |
712 | #define sk_KRB5_PRINCNAME_sort(st) SKM_sk_sort(KRB5_PRINCNAME, (st)) | 685 | #define sk_KRB5_PRINCNAME_sort(st) SKM_sk_sort(KRB5_PRINCNAME, (st)) |
713 | #define sk_KRB5_PRINCNAME_is_sorted(st) SKM_sk_is_sorted(KRB5_PRINCNAME, (st)) | ||
714 | 686 | ||
715 | #define sk_KRB5_TKTBODY_new(st) SKM_sk_new(KRB5_TKTBODY, (st)) | 687 | #define sk_KRB5_TKTBODY_new(st) SKM_sk_new(KRB5_TKTBODY, (st)) |
716 | #define sk_KRB5_TKTBODY_new_null() SKM_sk_new_null(KRB5_TKTBODY) | 688 | #define sk_KRB5_TKTBODY_new_null() SKM_sk_new_null(KRB5_TKTBODY) |
@@ -731,7 +703,6 @@ STACK_OF(type) \ | |||
731 | #define sk_KRB5_TKTBODY_shift(st) SKM_sk_shift(KRB5_TKTBODY, (st)) | 703 | #define sk_KRB5_TKTBODY_shift(st) SKM_sk_shift(KRB5_TKTBODY, (st)) |
732 | #define sk_KRB5_TKTBODY_pop(st) SKM_sk_pop(KRB5_TKTBODY, (st)) | 704 | #define sk_KRB5_TKTBODY_pop(st) SKM_sk_pop(KRB5_TKTBODY, (st)) |
733 | #define sk_KRB5_TKTBODY_sort(st) SKM_sk_sort(KRB5_TKTBODY, (st)) | 705 | #define sk_KRB5_TKTBODY_sort(st) SKM_sk_sort(KRB5_TKTBODY, (st)) |
734 | #define sk_KRB5_TKTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_TKTBODY, (st)) | ||
735 | 706 | ||
736 | #define sk_MIME_HEADER_new(st) SKM_sk_new(MIME_HEADER, (st)) | 707 | #define sk_MIME_HEADER_new(st) SKM_sk_new(MIME_HEADER, (st)) |
737 | #define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER) | 708 | #define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER) |
@@ -752,7 +723,6 @@ STACK_OF(type) \ | |||
752 | #define sk_MIME_HEADER_shift(st) SKM_sk_shift(MIME_HEADER, (st)) | 723 | #define sk_MIME_HEADER_shift(st) SKM_sk_shift(MIME_HEADER, (st)) |
753 | #define sk_MIME_HEADER_pop(st) SKM_sk_pop(MIME_HEADER, (st)) | 724 | #define sk_MIME_HEADER_pop(st) SKM_sk_pop(MIME_HEADER, (st)) |
754 | #define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st)) | 725 | #define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st)) |
755 | #define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st)) | ||
756 | 726 | ||
757 | #define sk_MIME_PARAM_new(st) SKM_sk_new(MIME_PARAM, (st)) | 727 | #define sk_MIME_PARAM_new(st) SKM_sk_new(MIME_PARAM, (st)) |
758 | #define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM) | 728 | #define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM) |
@@ -773,7 +743,6 @@ STACK_OF(type) \ | |||
773 | #define sk_MIME_PARAM_shift(st) SKM_sk_shift(MIME_PARAM, (st)) | 743 | #define sk_MIME_PARAM_shift(st) SKM_sk_shift(MIME_PARAM, (st)) |
774 | #define sk_MIME_PARAM_pop(st) SKM_sk_pop(MIME_PARAM, (st)) | 744 | #define sk_MIME_PARAM_pop(st) SKM_sk_pop(MIME_PARAM, (st)) |
775 | #define sk_MIME_PARAM_sort(st) SKM_sk_sort(MIME_PARAM, (st)) | 745 | #define sk_MIME_PARAM_sort(st) SKM_sk_sort(MIME_PARAM, (st)) |
776 | #define sk_MIME_PARAM_is_sorted(st) SKM_sk_is_sorted(MIME_PARAM, (st)) | ||
777 | 746 | ||
778 | #define sk_NAME_FUNCS_new(st) SKM_sk_new(NAME_FUNCS, (st)) | 747 | #define sk_NAME_FUNCS_new(st) SKM_sk_new(NAME_FUNCS, (st)) |
779 | #define sk_NAME_FUNCS_new_null() SKM_sk_new_null(NAME_FUNCS) | 748 | #define sk_NAME_FUNCS_new_null() SKM_sk_new_null(NAME_FUNCS) |
@@ -794,7 +763,6 @@ STACK_OF(type) \ | |||
794 | #define sk_NAME_FUNCS_shift(st) SKM_sk_shift(NAME_FUNCS, (st)) | 763 | #define sk_NAME_FUNCS_shift(st) SKM_sk_shift(NAME_FUNCS, (st)) |
795 | #define sk_NAME_FUNCS_pop(st) SKM_sk_pop(NAME_FUNCS, (st)) | 764 | #define sk_NAME_FUNCS_pop(st) SKM_sk_pop(NAME_FUNCS, (st)) |
796 | #define sk_NAME_FUNCS_sort(st) SKM_sk_sort(NAME_FUNCS, (st)) | 765 | #define sk_NAME_FUNCS_sort(st) SKM_sk_sort(NAME_FUNCS, (st)) |
797 | #define sk_NAME_FUNCS_is_sorted(st) SKM_sk_is_sorted(NAME_FUNCS, (st)) | ||
798 | 766 | ||
799 | #define sk_OCSP_CERTID_new(st) SKM_sk_new(OCSP_CERTID, (st)) | 767 | #define sk_OCSP_CERTID_new(st) SKM_sk_new(OCSP_CERTID, (st)) |
800 | #define sk_OCSP_CERTID_new_null() SKM_sk_new_null(OCSP_CERTID) | 768 | #define sk_OCSP_CERTID_new_null() SKM_sk_new_null(OCSP_CERTID) |
@@ -815,7 +783,6 @@ STACK_OF(type) \ | |||
815 | #define sk_OCSP_CERTID_shift(st) SKM_sk_shift(OCSP_CERTID, (st)) | 783 | #define sk_OCSP_CERTID_shift(st) SKM_sk_shift(OCSP_CERTID, (st)) |
816 | #define sk_OCSP_CERTID_pop(st) SKM_sk_pop(OCSP_CERTID, (st)) | 784 | #define sk_OCSP_CERTID_pop(st) SKM_sk_pop(OCSP_CERTID, (st)) |
817 | #define sk_OCSP_CERTID_sort(st) SKM_sk_sort(OCSP_CERTID, (st)) | 785 | #define sk_OCSP_CERTID_sort(st) SKM_sk_sort(OCSP_CERTID, (st)) |
818 | #define sk_OCSP_CERTID_is_sorted(st) SKM_sk_is_sorted(OCSP_CERTID, (st)) | ||
819 | 786 | ||
820 | #define sk_OCSP_ONEREQ_new(st) SKM_sk_new(OCSP_ONEREQ, (st)) | 787 | #define sk_OCSP_ONEREQ_new(st) SKM_sk_new(OCSP_ONEREQ, (st)) |
821 | #define sk_OCSP_ONEREQ_new_null() SKM_sk_new_null(OCSP_ONEREQ) | 788 | #define sk_OCSP_ONEREQ_new_null() SKM_sk_new_null(OCSP_ONEREQ) |
@@ -836,7 +803,6 @@ STACK_OF(type) \ | |||
836 | #define sk_OCSP_ONEREQ_shift(st) SKM_sk_shift(OCSP_ONEREQ, (st)) | 803 | #define sk_OCSP_ONEREQ_shift(st) SKM_sk_shift(OCSP_ONEREQ, (st)) |
837 | #define sk_OCSP_ONEREQ_pop(st) SKM_sk_pop(OCSP_ONEREQ, (st)) | 804 | #define sk_OCSP_ONEREQ_pop(st) SKM_sk_pop(OCSP_ONEREQ, (st)) |
838 | #define sk_OCSP_ONEREQ_sort(st) SKM_sk_sort(OCSP_ONEREQ, (st)) | 805 | #define sk_OCSP_ONEREQ_sort(st) SKM_sk_sort(OCSP_ONEREQ, (st)) |
839 | #define sk_OCSP_ONEREQ_is_sorted(st) SKM_sk_is_sorted(OCSP_ONEREQ, (st)) | ||
840 | 806 | ||
841 | #define sk_OCSP_SINGLERESP_new(st) SKM_sk_new(OCSP_SINGLERESP, (st)) | 807 | #define sk_OCSP_SINGLERESP_new(st) SKM_sk_new(OCSP_SINGLERESP, (st)) |
842 | #define sk_OCSP_SINGLERESP_new_null() SKM_sk_new_null(OCSP_SINGLERESP) | 808 | #define sk_OCSP_SINGLERESP_new_null() SKM_sk_new_null(OCSP_SINGLERESP) |
@@ -857,7 +823,6 @@ STACK_OF(type) \ | |||
857 | #define sk_OCSP_SINGLERESP_shift(st) SKM_sk_shift(OCSP_SINGLERESP, (st)) | 823 | #define sk_OCSP_SINGLERESP_shift(st) SKM_sk_shift(OCSP_SINGLERESP, (st)) |
858 | #define sk_OCSP_SINGLERESP_pop(st) SKM_sk_pop(OCSP_SINGLERESP, (st)) | 824 | #define sk_OCSP_SINGLERESP_pop(st) SKM_sk_pop(OCSP_SINGLERESP, (st)) |
859 | #define sk_OCSP_SINGLERESP_sort(st) SKM_sk_sort(OCSP_SINGLERESP, (st)) | 825 | #define sk_OCSP_SINGLERESP_sort(st) SKM_sk_sort(OCSP_SINGLERESP, (st)) |
860 | #define sk_OCSP_SINGLERESP_is_sorted(st) SKM_sk_is_sorted(OCSP_SINGLERESP, (st)) | ||
861 | 826 | ||
862 | #define sk_PKCS12_SAFEBAG_new(st) SKM_sk_new(PKCS12_SAFEBAG, (st)) | 827 | #define sk_PKCS12_SAFEBAG_new(st) SKM_sk_new(PKCS12_SAFEBAG, (st)) |
863 | #define sk_PKCS12_SAFEBAG_new_null() SKM_sk_new_null(PKCS12_SAFEBAG) | 828 | #define sk_PKCS12_SAFEBAG_new_null() SKM_sk_new_null(PKCS12_SAFEBAG) |
@@ -878,7 +843,6 @@ STACK_OF(type) \ | |||
878 | #define sk_PKCS12_SAFEBAG_shift(st) SKM_sk_shift(PKCS12_SAFEBAG, (st)) | 843 | #define sk_PKCS12_SAFEBAG_shift(st) SKM_sk_shift(PKCS12_SAFEBAG, (st)) |
879 | #define sk_PKCS12_SAFEBAG_pop(st) SKM_sk_pop(PKCS12_SAFEBAG, (st)) | 844 | #define sk_PKCS12_SAFEBAG_pop(st) SKM_sk_pop(PKCS12_SAFEBAG, (st)) |
880 | #define sk_PKCS12_SAFEBAG_sort(st) SKM_sk_sort(PKCS12_SAFEBAG, (st)) | 845 | #define sk_PKCS12_SAFEBAG_sort(st) SKM_sk_sort(PKCS12_SAFEBAG, (st)) |
881 | #define sk_PKCS12_SAFEBAG_is_sorted(st) SKM_sk_is_sorted(PKCS12_SAFEBAG, (st)) | ||
882 | 846 | ||
883 | #define sk_PKCS7_new(st) SKM_sk_new(PKCS7, (st)) | 847 | #define sk_PKCS7_new(st) SKM_sk_new(PKCS7, (st)) |
884 | #define sk_PKCS7_new_null() SKM_sk_new_null(PKCS7) | 848 | #define sk_PKCS7_new_null() SKM_sk_new_null(PKCS7) |
@@ -899,7 +863,6 @@ STACK_OF(type) \ | |||
899 | #define sk_PKCS7_shift(st) SKM_sk_shift(PKCS7, (st)) | 863 | #define sk_PKCS7_shift(st) SKM_sk_shift(PKCS7, (st)) |
900 | #define sk_PKCS7_pop(st) SKM_sk_pop(PKCS7, (st)) | 864 | #define sk_PKCS7_pop(st) SKM_sk_pop(PKCS7, (st)) |
901 | #define sk_PKCS7_sort(st) SKM_sk_sort(PKCS7, (st)) | 865 | #define sk_PKCS7_sort(st) SKM_sk_sort(PKCS7, (st)) |
902 | #define sk_PKCS7_is_sorted(st) SKM_sk_is_sorted(PKCS7, (st)) | ||
903 | 866 | ||
904 | #define sk_PKCS7_RECIP_INFO_new(st) SKM_sk_new(PKCS7_RECIP_INFO, (st)) | 867 | #define sk_PKCS7_RECIP_INFO_new(st) SKM_sk_new(PKCS7_RECIP_INFO, (st)) |
905 | #define sk_PKCS7_RECIP_INFO_new_null() SKM_sk_new_null(PKCS7_RECIP_INFO) | 868 | #define sk_PKCS7_RECIP_INFO_new_null() SKM_sk_new_null(PKCS7_RECIP_INFO) |
@@ -920,7 +883,6 @@ STACK_OF(type) \ | |||
920 | #define sk_PKCS7_RECIP_INFO_shift(st) SKM_sk_shift(PKCS7_RECIP_INFO, (st)) | 883 | #define sk_PKCS7_RECIP_INFO_shift(st) SKM_sk_shift(PKCS7_RECIP_INFO, (st)) |
921 | #define sk_PKCS7_RECIP_INFO_pop(st) SKM_sk_pop(PKCS7_RECIP_INFO, (st)) | 884 | #define sk_PKCS7_RECIP_INFO_pop(st) SKM_sk_pop(PKCS7_RECIP_INFO, (st)) |
922 | #define sk_PKCS7_RECIP_INFO_sort(st) SKM_sk_sort(PKCS7_RECIP_INFO, (st)) | 885 | #define sk_PKCS7_RECIP_INFO_sort(st) SKM_sk_sort(PKCS7_RECIP_INFO, (st)) |
923 | #define sk_PKCS7_RECIP_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_RECIP_INFO, (st)) | ||
924 | 886 | ||
925 | #define sk_PKCS7_SIGNER_INFO_new(st) SKM_sk_new(PKCS7_SIGNER_INFO, (st)) | 887 | #define sk_PKCS7_SIGNER_INFO_new(st) SKM_sk_new(PKCS7_SIGNER_INFO, (st)) |
926 | #define sk_PKCS7_SIGNER_INFO_new_null() SKM_sk_new_null(PKCS7_SIGNER_INFO) | 888 | #define sk_PKCS7_SIGNER_INFO_new_null() SKM_sk_new_null(PKCS7_SIGNER_INFO) |
@@ -941,7 +903,6 @@ STACK_OF(type) \ | |||
941 | #define sk_PKCS7_SIGNER_INFO_shift(st) SKM_sk_shift(PKCS7_SIGNER_INFO, (st)) | 903 | #define sk_PKCS7_SIGNER_INFO_shift(st) SKM_sk_shift(PKCS7_SIGNER_INFO, (st)) |
942 | #define sk_PKCS7_SIGNER_INFO_pop(st) SKM_sk_pop(PKCS7_SIGNER_INFO, (st)) | 904 | #define sk_PKCS7_SIGNER_INFO_pop(st) SKM_sk_pop(PKCS7_SIGNER_INFO, (st)) |
943 | #define sk_PKCS7_SIGNER_INFO_sort(st) SKM_sk_sort(PKCS7_SIGNER_INFO, (st)) | 905 | #define sk_PKCS7_SIGNER_INFO_sort(st) SKM_sk_sort(PKCS7_SIGNER_INFO, (st)) |
944 | #define sk_PKCS7_SIGNER_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_SIGNER_INFO, (st)) | ||
945 | 906 | ||
946 | #define sk_POLICYINFO_new(st) SKM_sk_new(POLICYINFO, (st)) | 907 | #define sk_POLICYINFO_new(st) SKM_sk_new(POLICYINFO, (st)) |
947 | #define sk_POLICYINFO_new_null() SKM_sk_new_null(POLICYINFO) | 908 | #define sk_POLICYINFO_new_null() SKM_sk_new_null(POLICYINFO) |
@@ -962,7 +923,6 @@ STACK_OF(type) \ | |||
962 | #define sk_POLICYINFO_shift(st) SKM_sk_shift(POLICYINFO, (st)) | 923 | #define sk_POLICYINFO_shift(st) SKM_sk_shift(POLICYINFO, (st)) |
963 | #define sk_POLICYINFO_pop(st) SKM_sk_pop(POLICYINFO, (st)) | 924 | #define sk_POLICYINFO_pop(st) SKM_sk_pop(POLICYINFO, (st)) |
964 | #define sk_POLICYINFO_sort(st) SKM_sk_sort(POLICYINFO, (st)) | 925 | #define sk_POLICYINFO_sort(st) SKM_sk_sort(POLICYINFO, (st)) |
965 | #define sk_POLICYINFO_is_sorted(st) SKM_sk_is_sorted(POLICYINFO, (st)) | ||
966 | 926 | ||
967 | #define sk_POLICYQUALINFO_new(st) SKM_sk_new(POLICYQUALINFO, (st)) | 927 | #define sk_POLICYQUALINFO_new(st) SKM_sk_new(POLICYQUALINFO, (st)) |
968 | #define sk_POLICYQUALINFO_new_null() SKM_sk_new_null(POLICYQUALINFO) | 928 | #define sk_POLICYQUALINFO_new_null() SKM_sk_new_null(POLICYQUALINFO) |
@@ -983,7 +943,6 @@ STACK_OF(type) \ | |||
983 | #define sk_POLICYQUALINFO_shift(st) SKM_sk_shift(POLICYQUALINFO, (st)) | 943 | #define sk_POLICYQUALINFO_shift(st) SKM_sk_shift(POLICYQUALINFO, (st)) |
984 | #define sk_POLICYQUALINFO_pop(st) SKM_sk_pop(POLICYQUALINFO, (st)) | 944 | #define sk_POLICYQUALINFO_pop(st) SKM_sk_pop(POLICYQUALINFO, (st)) |
985 | #define sk_POLICYQUALINFO_sort(st) SKM_sk_sort(POLICYQUALINFO, (st)) | 945 | #define sk_POLICYQUALINFO_sort(st) SKM_sk_sort(POLICYQUALINFO, (st)) |
986 | #define sk_POLICYQUALINFO_is_sorted(st) SKM_sk_is_sorted(POLICYQUALINFO, (st)) | ||
987 | 946 | ||
988 | #define sk_SSL_CIPHER_new(st) SKM_sk_new(SSL_CIPHER, (st)) | 947 | #define sk_SSL_CIPHER_new(st) SKM_sk_new(SSL_CIPHER, (st)) |
989 | #define sk_SSL_CIPHER_new_null() SKM_sk_new_null(SSL_CIPHER) | 948 | #define sk_SSL_CIPHER_new_null() SKM_sk_new_null(SSL_CIPHER) |
@@ -1004,7 +963,6 @@ STACK_OF(type) \ | |||
1004 | #define sk_SSL_CIPHER_shift(st) SKM_sk_shift(SSL_CIPHER, (st)) | 963 | #define sk_SSL_CIPHER_shift(st) SKM_sk_shift(SSL_CIPHER, (st)) |
1005 | #define sk_SSL_CIPHER_pop(st) SKM_sk_pop(SSL_CIPHER, (st)) | 964 | #define sk_SSL_CIPHER_pop(st) SKM_sk_pop(SSL_CIPHER, (st)) |
1006 | #define sk_SSL_CIPHER_sort(st) SKM_sk_sort(SSL_CIPHER, (st)) | 965 | #define sk_SSL_CIPHER_sort(st) SKM_sk_sort(SSL_CIPHER, (st)) |
1007 | #define sk_SSL_CIPHER_is_sorted(st) SKM_sk_is_sorted(SSL_CIPHER, (st)) | ||
1008 | 966 | ||
1009 | #define sk_SSL_COMP_new(st) SKM_sk_new(SSL_COMP, (st)) | 967 | #define sk_SSL_COMP_new(st) SKM_sk_new(SSL_COMP, (st)) |
1010 | #define sk_SSL_COMP_new_null() SKM_sk_new_null(SSL_COMP) | 968 | #define sk_SSL_COMP_new_null() SKM_sk_new_null(SSL_COMP) |
@@ -1025,7 +983,6 @@ STACK_OF(type) \ | |||
1025 | #define sk_SSL_COMP_shift(st) SKM_sk_shift(SSL_COMP, (st)) | 983 | #define sk_SSL_COMP_shift(st) SKM_sk_shift(SSL_COMP, (st)) |
1026 | #define sk_SSL_COMP_pop(st) SKM_sk_pop(SSL_COMP, (st)) | 984 | #define sk_SSL_COMP_pop(st) SKM_sk_pop(SSL_COMP, (st)) |
1027 | #define sk_SSL_COMP_sort(st) SKM_sk_sort(SSL_COMP, (st)) | 985 | #define sk_SSL_COMP_sort(st) SKM_sk_sort(SSL_COMP, (st)) |
1028 | #define sk_SSL_COMP_is_sorted(st) SKM_sk_is_sorted(SSL_COMP, (st)) | ||
1029 | 986 | ||
1030 | #define sk_SXNETID_new(st) SKM_sk_new(SXNETID, (st)) | 987 | #define sk_SXNETID_new(st) SKM_sk_new(SXNETID, (st)) |
1031 | #define sk_SXNETID_new_null() SKM_sk_new_null(SXNETID) | 988 | #define sk_SXNETID_new_null() SKM_sk_new_null(SXNETID) |
@@ -1046,7 +1003,6 @@ STACK_OF(type) \ | |||
1046 | #define sk_SXNETID_shift(st) SKM_sk_shift(SXNETID, (st)) | 1003 | #define sk_SXNETID_shift(st) SKM_sk_shift(SXNETID, (st)) |
1047 | #define sk_SXNETID_pop(st) SKM_sk_pop(SXNETID, (st)) | 1004 | #define sk_SXNETID_pop(st) SKM_sk_pop(SXNETID, (st)) |
1048 | #define sk_SXNETID_sort(st) SKM_sk_sort(SXNETID, (st)) | 1005 | #define sk_SXNETID_sort(st) SKM_sk_sort(SXNETID, (st)) |
1049 | #define sk_SXNETID_is_sorted(st) SKM_sk_is_sorted(SXNETID, (st)) | ||
1050 | 1006 | ||
1051 | #define sk_UI_STRING_new(st) SKM_sk_new(UI_STRING, (st)) | 1007 | #define sk_UI_STRING_new(st) SKM_sk_new(UI_STRING, (st)) |
1052 | #define sk_UI_STRING_new_null() SKM_sk_new_null(UI_STRING) | 1008 | #define sk_UI_STRING_new_null() SKM_sk_new_null(UI_STRING) |
@@ -1067,7 +1023,6 @@ STACK_OF(type) \ | |||
1067 | #define sk_UI_STRING_shift(st) SKM_sk_shift(UI_STRING, (st)) | 1023 | #define sk_UI_STRING_shift(st) SKM_sk_shift(UI_STRING, (st)) |
1068 | #define sk_UI_STRING_pop(st) SKM_sk_pop(UI_STRING, (st)) | 1024 | #define sk_UI_STRING_pop(st) SKM_sk_pop(UI_STRING, (st)) |
1069 | #define sk_UI_STRING_sort(st) SKM_sk_sort(UI_STRING, (st)) | 1025 | #define sk_UI_STRING_sort(st) SKM_sk_sort(UI_STRING, (st)) |
1070 | #define sk_UI_STRING_is_sorted(st) SKM_sk_is_sorted(UI_STRING, (st)) | ||
1071 | 1026 | ||
1072 | #define sk_X509_new(st) SKM_sk_new(X509, (st)) | 1027 | #define sk_X509_new(st) SKM_sk_new(X509, (st)) |
1073 | #define sk_X509_new_null() SKM_sk_new_null(X509) | 1028 | #define sk_X509_new_null() SKM_sk_new_null(X509) |
@@ -1088,7 +1043,6 @@ STACK_OF(type) \ | |||
1088 | #define sk_X509_shift(st) SKM_sk_shift(X509, (st)) | 1043 | #define sk_X509_shift(st) SKM_sk_shift(X509, (st)) |
1089 | #define sk_X509_pop(st) SKM_sk_pop(X509, (st)) | 1044 | #define sk_X509_pop(st) SKM_sk_pop(X509, (st)) |
1090 | #define sk_X509_sort(st) SKM_sk_sort(X509, (st)) | 1045 | #define sk_X509_sort(st) SKM_sk_sort(X509, (st)) |
1091 | #define sk_X509_is_sorted(st) SKM_sk_is_sorted(X509, (st)) | ||
1092 | 1046 | ||
1093 | #define sk_X509V3_EXT_METHOD_new(st) SKM_sk_new(X509V3_EXT_METHOD, (st)) | 1047 | #define sk_X509V3_EXT_METHOD_new(st) SKM_sk_new(X509V3_EXT_METHOD, (st)) |
1094 | #define sk_X509V3_EXT_METHOD_new_null() SKM_sk_new_null(X509V3_EXT_METHOD) | 1048 | #define sk_X509V3_EXT_METHOD_new_null() SKM_sk_new_null(X509V3_EXT_METHOD) |
@@ -1109,7 +1063,6 @@ STACK_OF(type) \ | |||
1109 | #define sk_X509V3_EXT_METHOD_shift(st) SKM_sk_shift(X509V3_EXT_METHOD, (st)) | 1063 | #define sk_X509V3_EXT_METHOD_shift(st) SKM_sk_shift(X509V3_EXT_METHOD, (st)) |
1110 | #define sk_X509V3_EXT_METHOD_pop(st) SKM_sk_pop(X509V3_EXT_METHOD, (st)) | 1064 | #define sk_X509V3_EXT_METHOD_pop(st) SKM_sk_pop(X509V3_EXT_METHOD, (st)) |
1111 | #define sk_X509V3_EXT_METHOD_sort(st) SKM_sk_sort(X509V3_EXT_METHOD, (st)) | 1065 | #define sk_X509V3_EXT_METHOD_sort(st) SKM_sk_sort(X509V3_EXT_METHOD, (st)) |
1112 | #define sk_X509V3_EXT_METHOD_is_sorted(st) SKM_sk_is_sorted(X509V3_EXT_METHOD, (st)) | ||
1113 | 1066 | ||
1114 | #define sk_X509_ALGOR_new(st) SKM_sk_new(X509_ALGOR, (st)) | 1067 | #define sk_X509_ALGOR_new(st) SKM_sk_new(X509_ALGOR, (st)) |
1115 | #define sk_X509_ALGOR_new_null() SKM_sk_new_null(X509_ALGOR) | 1068 | #define sk_X509_ALGOR_new_null() SKM_sk_new_null(X509_ALGOR) |
@@ -1130,7 +1083,6 @@ STACK_OF(type) \ | |||
1130 | #define sk_X509_ALGOR_shift(st) SKM_sk_shift(X509_ALGOR, (st)) | 1083 | #define sk_X509_ALGOR_shift(st) SKM_sk_shift(X509_ALGOR, (st)) |
1131 | #define sk_X509_ALGOR_pop(st) SKM_sk_pop(X509_ALGOR, (st)) | 1084 | #define sk_X509_ALGOR_pop(st) SKM_sk_pop(X509_ALGOR, (st)) |
1132 | #define sk_X509_ALGOR_sort(st) SKM_sk_sort(X509_ALGOR, (st)) | 1085 | #define sk_X509_ALGOR_sort(st) SKM_sk_sort(X509_ALGOR, (st)) |
1133 | #define sk_X509_ALGOR_is_sorted(st) SKM_sk_is_sorted(X509_ALGOR, (st)) | ||
1134 | 1086 | ||
1135 | #define sk_X509_ATTRIBUTE_new(st) SKM_sk_new(X509_ATTRIBUTE, (st)) | 1087 | #define sk_X509_ATTRIBUTE_new(st) SKM_sk_new(X509_ATTRIBUTE, (st)) |
1136 | #define sk_X509_ATTRIBUTE_new_null() SKM_sk_new_null(X509_ATTRIBUTE) | 1088 | #define sk_X509_ATTRIBUTE_new_null() SKM_sk_new_null(X509_ATTRIBUTE) |
@@ -1151,7 +1103,6 @@ STACK_OF(type) \ | |||
1151 | #define sk_X509_ATTRIBUTE_shift(st) SKM_sk_shift(X509_ATTRIBUTE, (st)) | 1103 | #define sk_X509_ATTRIBUTE_shift(st) SKM_sk_shift(X509_ATTRIBUTE, (st)) |
1152 | #define sk_X509_ATTRIBUTE_pop(st) SKM_sk_pop(X509_ATTRIBUTE, (st)) | 1104 | #define sk_X509_ATTRIBUTE_pop(st) SKM_sk_pop(X509_ATTRIBUTE, (st)) |
1153 | #define sk_X509_ATTRIBUTE_sort(st) SKM_sk_sort(X509_ATTRIBUTE, (st)) | 1105 | #define sk_X509_ATTRIBUTE_sort(st) SKM_sk_sort(X509_ATTRIBUTE, (st)) |
1154 | #define sk_X509_ATTRIBUTE_is_sorted(st) SKM_sk_is_sorted(X509_ATTRIBUTE, (st)) | ||
1155 | 1106 | ||
1156 | #define sk_X509_CRL_new(st) SKM_sk_new(X509_CRL, (st)) | 1107 | #define sk_X509_CRL_new(st) SKM_sk_new(X509_CRL, (st)) |
1157 | #define sk_X509_CRL_new_null() SKM_sk_new_null(X509_CRL) | 1108 | #define sk_X509_CRL_new_null() SKM_sk_new_null(X509_CRL) |
@@ -1172,7 +1123,6 @@ STACK_OF(type) \ | |||
1172 | #define sk_X509_CRL_shift(st) SKM_sk_shift(X509_CRL, (st)) | 1123 | #define sk_X509_CRL_shift(st) SKM_sk_shift(X509_CRL, (st)) |
1173 | #define sk_X509_CRL_pop(st) SKM_sk_pop(X509_CRL, (st)) | 1124 | #define sk_X509_CRL_pop(st) SKM_sk_pop(X509_CRL, (st)) |
1174 | #define sk_X509_CRL_sort(st) SKM_sk_sort(X509_CRL, (st)) | 1125 | #define sk_X509_CRL_sort(st) SKM_sk_sort(X509_CRL, (st)) |
1175 | #define sk_X509_CRL_is_sorted(st) SKM_sk_is_sorted(X509_CRL, (st)) | ||
1176 | 1126 | ||
1177 | #define sk_X509_EXTENSION_new(st) SKM_sk_new(X509_EXTENSION, (st)) | 1127 | #define sk_X509_EXTENSION_new(st) SKM_sk_new(X509_EXTENSION, (st)) |
1178 | #define sk_X509_EXTENSION_new_null() SKM_sk_new_null(X509_EXTENSION) | 1128 | #define sk_X509_EXTENSION_new_null() SKM_sk_new_null(X509_EXTENSION) |
@@ -1193,7 +1143,6 @@ STACK_OF(type) \ | |||
1193 | #define sk_X509_EXTENSION_shift(st) SKM_sk_shift(X509_EXTENSION, (st)) | 1143 | #define sk_X509_EXTENSION_shift(st) SKM_sk_shift(X509_EXTENSION, (st)) |
1194 | #define sk_X509_EXTENSION_pop(st) SKM_sk_pop(X509_EXTENSION, (st)) | 1144 | #define sk_X509_EXTENSION_pop(st) SKM_sk_pop(X509_EXTENSION, (st)) |
1195 | #define sk_X509_EXTENSION_sort(st) SKM_sk_sort(X509_EXTENSION, (st)) | 1145 | #define sk_X509_EXTENSION_sort(st) SKM_sk_sort(X509_EXTENSION, (st)) |
1196 | #define sk_X509_EXTENSION_is_sorted(st) SKM_sk_is_sorted(X509_EXTENSION, (st)) | ||
1197 | 1146 | ||
1198 | #define sk_X509_INFO_new(st) SKM_sk_new(X509_INFO, (st)) | 1147 | #define sk_X509_INFO_new(st) SKM_sk_new(X509_INFO, (st)) |
1199 | #define sk_X509_INFO_new_null() SKM_sk_new_null(X509_INFO) | 1148 | #define sk_X509_INFO_new_null() SKM_sk_new_null(X509_INFO) |
@@ -1214,7 +1163,6 @@ STACK_OF(type) \ | |||
1214 | #define sk_X509_INFO_shift(st) SKM_sk_shift(X509_INFO, (st)) | 1163 | #define sk_X509_INFO_shift(st) SKM_sk_shift(X509_INFO, (st)) |
1215 | #define sk_X509_INFO_pop(st) SKM_sk_pop(X509_INFO, (st)) | 1164 | #define sk_X509_INFO_pop(st) SKM_sk_pop(X509_INFO, (st)) |
1216 | #define sk_X509_INFO_sort(st) SKM_sk_sort(X509_INFO, (st)) | 1165 | #define sk_X509_INFO_sort(st) SKM_sk_sort(X509_INFO, (st)) |
1217 | #define sk_X509_INFO_is_sorted(st) SKM_sk_is_sorted(X509_INFO, (st)) | ||
1218 | 1166 | ||
1219 | #define sk_X509_LOOKUP_new(st) SKM_sk_new(X509_LOOKUP, (st)) | 1167 | #define sk_X509_LOOKUP_new(st) SKM_sk_new(X509_LOOKUP, (st)) |
1220 | #define sk_X509_LOOKUP_new_null() SKM_sk_new_null(X509_LOOKUP) | 1168 | #define sk_X509_LOOKUP_new_null() SKM_sk_new_null(X509_LOOKUP) |
@@ -1235,7 +1183,6 @@ STACK_OF(type) \ | |||
1235 | #define sk_X509_LOOKUP_shift(st) SKM_sk_shift(X509_LOOKUP, (st)) | 1183 | #define sk_X509_LOOKUP_shift(st) SKM_sk_shift(X509_LOOKUP, (st)) |
1236 | #define sk_X509_LOOKUP_pop(st) SKM_sk_pop(X509_LOOKUP, (st)) | 1184 | #define sk_X509_LOOKUP_pop(st) SKM_sk_pop(X509_LOOKUP, (st)) |
1237 | #define sk_X509_LOOKUP_sort(st) SKM_sk_sort(X509_LOOKUP, (st)) | 1185 | #define sk_X509_LOOKUP_sort(st) SKM_sk_sort(X509_LOOKUP, (st)) |
1238 | #define sk_X509_LOOKUP_is_sorted(st) SKM_sk_is_sorted(X509_LOOKUP, (st)) | ||
1239 | 1186 | ||
1240 | #define sk_X509_NAME_new(st) SKM_sk_new(X509_NAME, (st)) | 1187 | #define sk_X509_NAME_new(st) SKM_sk_new(X509_NAME, (st)) |
1241 | #define sk_X509_NAME_new_null() SKM_sk_new_null(X509_NAME) | 1188 | #define sk_X509_NAME_new_null() SKM_sk_new_null(X509_NAME) |
@@ -1256,7 +1203,6 @@ STACK_OF(type) \ | |||
1256 | #define sk_X509_NAME_shift(st) SKM_sk_shift(X509_NAME, (st)) | 1203 | #define sk_X509_NAME_shift(st) SKM_sk_shift(X509_NAME, (st)) |
1257 | #define sk_X509_NAME_pop(st) SKM_sk_pop(X509_NAME, (st)) | 1204 | #define sk_X509_NAME_pop(st) SKM_sk_pop(X509_NAME, (st)) |
1258 | #define sk_X509_NAME_sort(st) SKM_sk_sort(X509_NAME, (st)) | 1205 | #define sk_X509_NAME_sort(st) SKM_sk_sort(X509_NAME, (st)) |
1259 | #define sk_X509_NAME_is_sorted(st) SKM_sk_is_sorted(X509_NAME, (st)) | ||
1260 | 1206 | ||
1261 | #define sk_X509_NAME_ENTRY_new(st) SKM_sk_new(X509_NAME_ENTRY, (st)) | 1207 | #define sk_X509_NAME_ENTRY_new(st) SKM_sk_new(X509_NAME_ENTRY, (st)) |
1262 | #define sk_X509_NAME_ENTRY_new_null() SKM_sk_new_null(X509_NAME_ENTRY) | 1208 | #define sk_X509_NAME_ENTRY_new_null() SKM_sk_new_null(X509_NAME_ENTRY) |
@@ -1277,7 +1223,6 @@ STACK_OF(type) \ | |||
1277 | #define sk_X509_NAME_ENTRY_shift(st) SKM_sk_shift(X509_NAME_ENTRY, (st)) | 1223 | #define sk_X509_NAME_ENTRY_shift(st) SKM_sk_shift(X509_NAME_ENTRY, (st)) |
1278 | #define sk_X509_NAME_ENTRY_pop(st) SKM_sk_pop(X509_NAME_ENTRY, (st)) | 1224 | #define sk_X509_NAME_ENTRY_pop(st) SKM_sk_pop(X509_NAME_ENTRY, (st)) |
1279 | #define sk_X509_NAME_ENTRY_sort(st) SKM_sk_sort(X509_NAME_ENTRY, (st)) | 1225 | #define sk_X509_NAME_ENTRY_sort(st) SKM_sk_sort(X509_NAME_ENTRY, (st)) |
1280 | #define sk_X509_NAME_ENTRY_is_sorted(st) SKM_sk_is_sorted(X509_NAME_ENTRY, (st)) | ||
1281 | 1226 | ||
1282 | #define sk_X509_OBJECT_new(st) SKM_sk_new(X509_OBJECT, (st)) | 1227 | #define sk_X509_OBJECT_new(st) SKM_sk_new(X509_OBJECT, (st)) |
1283 | #define sk_X509_OBJECT_new_null() SKM_sk_new_null(X509_OBJECT) | 1228 | #define sk_X509_OBJECT_new_null() SKM_sk_new_null(X509_OBJECT) |
@@ -1298,7 +1243,6 @@ STACK_OF(type) \ | |||
1298 | #define sk_X509_OBJECT_shift(st) SKM_sk_shift(X509_OBJECT, (st)) | 1243 | #define sk_X509_OBJECT_shift(st) SKM_sk_shift(X509_OBJECT, (st)) |
1299 | #define sk_X509_OBJECT_pop(st) SKM_sk_pop(X509_OBJECT, (st)) | 1244 | #define sk_X509_OBJECT_pop(st) SKM_sk_pop(X509_OBJECT, (st)) |
1300 | #define sk_X509_OBJECT_sort(st) SKM_sk_sort(X509_OBJECT, (st)) | 1245 | #define sk_X509_OBJECT_sort(st) SKM_sk_sort(X509_OBJECT, (st)) |
1301 | #define sk_X509_OBJECT_is_sorted(st) SKM_sk_is_sorted(X509_OBJECT, (st)) | ||
1302 | 1246 | ||
1303 | #define sk_X509_PURPOSE_new(st) SKM_sk_new(X509_PURPOSE, (st)) | 1247 | #define sk_X509_PURPOSE_new(st) SKM_sk_new(X509_PURPOSE, (st)) |
1304 | #define sk_X509_PURPOSE_new_null() SKM_sk_new_null(X509_PURPOSE) | 1248 | #define sk_X509_PURPOSE_new_null() SKM_sk_new_null(X509_PURPOSE) |
@@ -1319,7 +1263,6 @@ STACK_OF(type) \ | |||
1319 | #define sk_X509_PURPOSE_shift(st) SKM_sk_shift(X509_PURPOSE, (st)) | 1263 | #define sk_X509_PURPOSE_shift(st) SKM_sk_shift(X509_PURPOSE, (st)) |
1320 | #define sk_X509_PURPOSE_pop(st) SKM_sk_pop(X509_PURPOSE, (st)) | 1264 | #define sk_X509_PURPOSE_pop(st) SKM_sk_pop(X509_PURPOSE, (st)) |
1321 | #define sk_X509_PURPOSE_sort(st) SKM_sk_sort(X509_PURPOSE, (st)) | 1265 | #define sk_X509_PURPOSE_sort(st) SKM_sk_sort(X509_PURPOSE, (st)) |
1322 | #define sk_X509_PURPOSE_is_sorted(st) SKM_sk_is_sorted(X509_PURPOSE, (st)) | ||
1323 | 1266 | ||
1324 | #define sk_X509_REVOKED_new(st) SKM_sk_new(X509_REVOKED, (st)) | 1267 | #define sk_X509_REVOKED_new(st) SKM_sk_new(X509_REVOKED, (st)) |
1325 | #define sk_X509_REVOKED_new_null() SKM_sk_new_null(X509_REVOKED) | 1268 | #define sk_X509_REVOKED_new_null() SKM_sk_new_null(X509_REVOKED) |
@@ -1340,7 +1283,6 @@ STACK_OF(type) \ | |||
1340 | #define sk_X509_REVOKED_shift(st) SKM_sk_shift(X509_REVOKED, (st)) | 1283 | #define sk_X509_REVOKED_shift(st) SKM_sk_shift(X509_REVOKED, (st)) |
1341 | #define sk_X509_REVOKED_pop(st) SKM_sk_pop(X509_REVOKED, (st)) | 1284 | #define sk_X509_REVOKED_pop(st) SKM_sk_pop(X509_REVOKED, (st)) |
1342 | #define sk_X509_REVOKED_sort(st) SKM_sk_sort(X509_REVOKED, (st)) | 1285 | #define sk_X509_REVOKED_sort(st) SKM_sk_sort(X509_REVOKED, (st)) |
1343 | #define sk_X509_REVOKED_is_sorted(st) SKM_sk_is_sorted(X509_REVOKED, (st)) | ||
1344 | 1286 | ||
1345 | #define sk_X509_TRUST_new(st) SKM_sk_new(X509_TRUST, (st)) | 1287 | #define sk_X509_TRUST_new(st) SKM_sk_new(X509_TRUST, (st)) |
1346 | #define sk_X509_TRUST_new_null() SKM_sk_new_null(X509_TRUST) | 1288 | #define sk_X509_TRUST_new_null() SKM_sk_new_null(X509_TRUST) |
@@ -1361,7 +1303,6 @@ STACK_OF(type) \ | |||
1361 | #define sk_X509_TRUST_shift(st) SKM_sk_shift(X509_TRUST, (st)) | 1303 | #define sk_X509_TRUST_shift(st) SKM_sk_shift(X509_TRUST, (st)) |
1362 | #define sk_X509_TRUST_pop(st) SKM_sk_pop(X509_TRUST, (st)) | 1304 | #define sk_X509_TRUST_pop(st) SKM_sk_pop(X509_TRUST, (st)) |
1363 | #define sk_X509_TRUST_sort(st) SKM_sk_sort(X509_TRUST, (st)) | 1305 | #define sk_X509_TRUST_sort(st) SKM_sk_sort(X509_TRUST, (st)) |
1364 | #define sk_X509_TRUST_is_sorted(st) SKM_sk_is_sorted(X509_TRUST, (st)) | ||
1365 | 1306 | ||
1366 | #define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ | 1307 | #define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ |
1367 | SKM_ASN1_SET_OF_d2i(ACCESS_DESCRIPTION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) | 1308 | SKM_ASN1_SET_OF_d2i(ACCESS_DESCRIPTION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) |
diff --git a/src/lib/libcrypto/stack/stack.c b/src/lib/libcrypto/stack/stack.c index c7173eb6ab..2496f28a8c 100644 --- a/src/lib/libcrypto/stack/stack.c +++ b/src/lib/libcrypto/stack/stack.c | |||
@@ -191,7 +191,8 @@ char *sk_delete(STACK *st, int loc) | |||
191 | char *ret; | 191 | char *ret; |
192 | int i,j; | 192 | int i,j; |
193 | 193 | ||
194 | if(!st || (loc < 0) || (loc >= st->num)) return NULL; | 194 | if ((st == NULL) || (st->num == 0) || (loc < 0) |
195 | || (loc >= st->num)) return(NULL); | ||
195 | 196 | ||
196 | ret=st->data[loc]; | 197 | ret=st->data[loc]; |
197 | if (loc != st->num-1) | 198 | if (loc != st->num-1) |
@@ -305,13 +306,13 @@ int sk_num(const STACK *st) | |||
305 | 306 | ||
306 | char *sk_value(const STACK *st, int i) | 307 | char *sk_value(const STACK *st, int i) |
307 | { | 308 | { |
308 | if(!st || (i < 0) || (i >= st->num)) return NULL; | 309 | if(st == NULL) return NULL; |
309 | return st->data[i]; | 310 | return st->data[i]; |
310 | } | 311 | } |
311 | 312 | ||
312 | char *sk_set(STACK *st, int i, char *value) | 313 | char *sk_set(STACK *st, int i, char *value) |
313 | { | 314 | { |
314 | if(!st || (i < 0) || (i >= st->num)) return NULL; | 315 | if(st == NULL) return NULL; |
315 | return (st->data[i] = value); | 316 | return (st->data[i] = value); |
316 | } | 317 | } |
317 | 318 | ||
@@ -331,10 +332,3 @@ void sk_sort(STACK *st) | |||
331 | st->sorted=1; | 332 | st->sorted=1; |
332 | } | 333 | } |
333 | } | 334 | } |
334 | |||
335 | int sk_is_sorted(const STACK *st) | ||
336 | { | ||
337 | if (!st) | ||
338 | return 1; | ||
339 | return st->sorted; | ||
340 | } | ||
diff --git a/src/lib/libcrypto/stack/stack.h b/src/lib/libcrypto/stack/stack.h index 7570b85fe8..8b436ca4b9 100644 --- a/src/lib/libcrypto/stack/stack.h +++ b/src/lib/libcrypto/stack/stack.h | |||
@@ -99,7 +99,6 @@ int (*sk_set_cmp_func(STACK *sk, int (*c)(const char * const *, | |||
99 | (const char * const *, const char * const *); | 99 | (const char * const *, const char * const *); |
100 | STACK *sk_dup(STACK *st); | 100 | STACK *sk_dup(STACK *st); |
101 | void sk_sort(STACK *st); | 101 | void sk_sort(STACK *st); |
102 | int sk_is_sorted(const STACK *st); | ||
103 | 102 | ||
104 | #ifdef __cplusplus | 103 | #ifdef __cplusplus |
105 | } | 104 | } |