Type in OSF1 platform name.

[openssl.git] / util / mkstack.pl

diff --git a/util/mkstack.pl b/util/mkstack.pl
index ec76351bcae10068f74263471edba8a0b50773a1..2a968f395fc22aa2368fe4b1de04a211e24c9b28 100755 (executable)
--- 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;
 
@@ -31,12 +31,17 @@ foreach $file (@source) {
        while(<IN>) {
                if (/^DECLARE_STACK_OF\(([^)]+)\)/) {
                        push @stacklst, $1;
+               } if (/^DECLARE_ASN1_SET_OF\(([^)]+)\)/) {
+                       push @asn1setlst, $1;
+               } if (/^DECLARE_PKCS12_STACK_OF\(([^)]+)\)/) {
+                       push @p12stklst, $1;
                }
        }
        close(IN);
 }
 
 
+
 my $old_stackfile = "";
 my $new_stackfile = "";
 my $inside_block = 0;
@@ -57,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))
@@ -70,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))
@@ -79,6 +85,27 @@ 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 (sort @asn1setlst) {
+               $new_stackfile .= <<EOF;
+
+#define d2i_ASN1_SET_OF_${type_thing}(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \\
+       SKM_ASN1_SET_OF_d2i($type_thing, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
+#define i2d_ASN1_SET_OF_${type_thing}(st, pp, i2d_func, ex_tag, ex_class, is_set) \\
+       SKM_ASN1_SET_OF_i2d($type_thing, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
+#define ASN1_seq_pack_${type_thing}(st, i2d_func, buf, len) \\
+       SKM_ASN1_seq_pack($type_thing, (st), (i2d_func), (buf), (len))
+#define ASN1_seq_unpack_${type_thing}(buf, len, d2i_func, free_func) \\
+       SKM_ASN1_seq_unpack($type_thing, (buf), (len), (d2i_func), (free_func))
+EOF
+       }
+       foreach $type_thing (sort @p12stklst) {
+               $new_stackfile .= <<EOF;
+
+#define PKCS12_decrypt_d2i_${type_thing}(algor, d2i_func, free_func, pass, passlen, oct, seq) \\
+       SKM_PKCS12_decrypt_d2i($type_thing, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
 EOF
        }
        $new_stackfile .= "/* End of util/mkstack.pl block, you may now edit :-) */\n";