Use bio_err not stderr in apps.

[openssl.git] / util / mkstack.pl

diff --git a/util/mkstack.pl b/util/mkstack.pl
index 06d2e16ccc4c39e54ce9ad0a467e3902d3df42ee..073902759ce06435c70ce9e6c71190115e6bee1b 100755 (executable)
--- a/util/mkstack.pl
+++ b/util/mkstack.pl
@@ -3,7 +3,7 @@
 # Search out "DECLARE_STACK_OF()" # declarations in .h and .c files,
 # and create corresponding macro declarations for crypto/stack/safestack.h.
 
-my $safestack = "crypto/stack/safestack.h";
+my $safestack = "include/openssl/safestack.h";
 my $do_write = 0;
 
 foreach ( @ARGV ) {
@@ -15,7 +15,7 @@ my @sstacklst;
 my @asn1setlst;
 my @p12stklst;
 my @lhashlst;
-my @source = (<crypto/*.[ch]>, <crypto/*/*.[ch]>, <ssl/*.[ch]>, <apps/*.[ch]>);
+my @source = (<include/openssl/*.h>, <crypto/*.[ch]>, <crypto/*/*.[ch]>, <ssl/*.[ch]>, <apps/*.[ch]>);
 foreach $file (@source) {
     next if -l $file;
 
@@ -30,12 +30,6 @@ foreach $file (@source) {
         elsif (/^DECLARE_SPECIAL_STACK_OF\(([^,\s]+)\s*,\s*([^>\s]+)\)/) {
             push @sstacklst, [$1, $2];
         }
-        elsif (/^DECLARE_ASN1_SET_OF\(([^)]+)\)/) {
-            push @asn1setlst, $1;
-        }
-        elsif (/^DECLARE_PKCS12_STACK_OF\(([^)]+)\)/) {
-            push @p12stklst, $1;
-        }
         elsif (/^DECLARE_LHASH_OF\(([^)]+)\)/) {
             push @lhashlst, $1;
         }
@@ -321,28 +315,6 @@ foreach $type_thing (sort @sstacklst) {
 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
-}
-
 foreach $type_thing (sort @lhashlst) {
     my $lc_tt = lc $type_thing;
     $new_stackfile .= <<EOF;