X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util%2Fmkstack.pl;h=2a968f395fc22aa2368fe4b1de04a211e24c9b28;hb=9034c56c6c71ac68f25f195300e3d7b129280824;hp=64371386837d184d70d492c6df8e5b3eff7f7d50;hpb=7ef8206859f9a52f48e817c023c744fe00e82c5d;p=oweals%2Fopenssl.git

diff --git a/util/mkstack.pl b/util/mkstack.pl
index 6437138683..2a968f395f 100755
--- a/util/mkstack.pl
+++ b/util/mkstack.pl
@@ -21,7 +21,7 @@ while (@ARGV) {
 }
 
 
-@source = (<crypto/*.[ch]>, <crypto/*/*.[ch]>, <rsaref/*.[ch]>, <ssl/*.[ch]>);
+@source = (<crypto/*.[ch]>, <crypto/*/*.[ch]>, <ssl/*.[ch]>);
 foreach $file (@source) {
 	next if -l $file;
 
@@ -62,7 +62,7 @@ while(<IN>) {
 	next if($inside_block != 1);
 	$new_stackfile .= "/* This block of defines is updated by util/mkstack.pl, please do not touch! */";
 		
-	foreach $type_thing (@stacklst) {
+	foreach $type_thing (sort @stacklst) {
 		$new_stackfile .= <<EOF;
 
 #define sk_${type_thing}_new(st) SKM_sk_new($type_thing, (st))
@@ -75,6 +75,7 @@ while(<IN>) {
 #define sk_${type_thing}_push(st, val) SKM_sk_push($type_thing, (st), (val))
 #define sk_${type_thing}_unshift(st, val) SKM_sk_unshift($type_thing, (st), (val))
 #define sk_${type_thing}_find(st, val) SKM_sk_find($type_thing, (st), (val))
+#define sk_${type_thing}_find_ex(st, val) SKM_sk_find_ex($type_thing, (st), (val))
 #define sk_${type_thing}_delete(st, i) SKM_sk_delete($type_thing, (st), (i))
 #define sk_${type_thing}_delete_ptr(st, ptr) SKM_sk_delete_ptr($type_thing, (st), (ptr))
 #define sk_${type_thing}_insert(st, val, i) SKM_sk_insert($type_thing, (st), (val), (i))
@@ -84,9 +85,10 @@ while(<IN>) {
 #define sk_${type_thing}_shift(st) SKM_sk_shift($type_thing, (st))
 #define sk_${type_thing}_pop(st) SKM_sk_pop($type_thing, (st))
 #define sk_${type_thing}_sort(st) SKM_sk_sort($type_thing, (st))
+#define sk_${type_thing}_is_sorted(st) SKM_sk_is_sorted($type_thing, (st))
 EOF
 	}
-	foreach $type_thing (@asn1setlst) {
+	foreach $type_thing (sort @asn1setlst) {
 		$new_stackfile .= <<EOF;
 
 #define d2i_ASN1_SET_OF_${type_thing}(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \\
@@ -99,7 +101,7 @@ EOF
 	SKM_ASN1_seq_unpack($type_thing, (buf), (len), (d2i_func), (free_func))
 EOF
 	}
-	foreach $type_thing (@p12stklst) {
+	foreach $type_thing (sort @p12stklst) {
 		$new_stackfile .= <<EOF;
 
 #define PKCS12_decrypt_d2i_${type_thing}(algor, d2i_func, free_func, pass, passlen, oct, seq) \\