update progs.pl to reflect changes in progs.h

diff --git a/apps/progs.h b/apps/progs.h
index d3ddf8286b31890d945dbe2c24012a049904d4b9..f83dbeaca308b8a2fb9378d7483410280c938581 100644 (file)
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -37,9 +37,7 @@ extern int pkcs8_main(int argc,char *argv[]);
 extern int spkac_main(int argc,char *argv[]);
 extern int smime_main(int argc,char *argv[]);
 extern int rand_main(int argc,char *argv[]);
-#ifndef OPENSSL_NO_ENGINE
 extern int engine_main(int argc,char *argv[]);
-#endif
 extern int ocsp_main(int argc,char *argv[]);
 
 #define FUNC_TYPE_GENERAL      1
@@ -48,7 +46,7 @@ extern int ocsp_main(int argc,char *argv[]);
 
 typedef struct {
        int type;
-       char *name;
+       const char *name;
        int (*func)(int argc,char *argv[]);
        } FUNCTION;
 

diff --git a/apps/progs.pl b/apps/progs.pl
index c94f49bbf037f0278df540ee551de774a6109d37..36569d2661c32e79e645cb10147bf7b2e124cfee 100644 (file)
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -16,8 +16,8 @@ print <<'EOF';
 
 typedef struct {
        int type;
-       char *name;
-       int (*func)();
+       const char *name;
+       int (*func)(int argc,char *argv[]);
        } FUNCTION;
 
 FUNCTION functions[] = {
@@ -29,6 +29,10 @@ foreach (@ARGV)
        $str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";
        if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))
                { print "#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))\n${str}#endif\n"; } 
+       elsif ( ($_ =~ /^speed$/))
+               { print "#ifndef OPENSSL_NO_SPEED\n${str}#endif\n"; }
+       elsif ( ($_ =~ /^engine$/))
+               { print "#ifndef OPENSSL_NO_ENGINE\n${str}#endif\n"; }
        elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) || ($_ =~ /^rsautl$/)) 
                { print "#ifndef OPENSSL_NO_RSA\n${str}#endif\n";  }
        elsif ( ($_ =~ /^dsa$/) || ($_ =~ /^gendsa$/) || ($_ =~ /^dsaparam$/))