Split client message reading and writing functions

[openssl.git] / util / mkstack.pl

diff --git a/util/mkstack.pl b/util/mkstack.pl
index 6e6741f23341f30f3af6712e12eee7c6ddc5c558..16a0172abac39f35fdfd4ed0c5eb487b9652cd70 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/include/internal/*.h>, <crypto/*.[ch]>, <crypto/*/*.[ch]>, <ssl/*.[ch]>, <apps/*.[ch]>);
 foreach $file (@source) {
     next if -l $file;
 
@@ -283,7 +283,7 @@ foreach $type_thing (sort @stacklst) {
 EOF
 }
 
-foreach $type_thing (sort @sstacklst) {
+foreach $type_thing (sort { $a->[0] cmp $b->[0]} @sstacklst) {
     my $t1 = $type_thing->[0];
     my $t2 = $type_thing->[1];
     $new_stackfile .= <<EOF;