提交 69740c2b 编写于 作者: N Nils Larsch

update progs.pl to reflect changes in progs.h

上级 119d1a1d
...@@ -37,9 +37,7 @@ extern int pkcs8_main(int argc,char *argv[]); ...@@ -37,9 +37,7 @@ extern int pkcs8_main(int argc,char *argv[]);
extern int spkac_main(int argc,char *argv[]); extern int spkac_main(int argc,char *argv[]);
extern int smime_main(int argc,char *argv[]); extern int smime_main(int argc,char *argv[]);
extern int rand_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[]); extern int engine_main(int argc,char *argv[]);
#endif
extern int ocsp_main(int argc,char *argv[]); extern int ocsp_main(int argc,char *argv[]);
#define FUNC_TYPE_GENERAL 1 #define FUNC_TYPE_GENERAL 1
...@@ -48,7 +46,7 @@ extern int ocsp_main(int argc,char *argv[]); ...@@ -48,7 +46,7 @@ extern int ocsp_main(int argc,char *argv[]);
typedef struct { typedef struct {
int type; int type;
char *name; const char *name;
int (*func)(int argc,char *argv[]); int (*func)(int argc,char *argv[]);
} FUNCTION; } FUNCTION;
......
...@@ -16,8 +16,8 @@ print <<'EOF'; ...@@ -16,8 +16,8 @@ print <<'EOF';
typedef struct { typedef struct {
int type; int type;
char *name; const char *name;
int (*func)(); int (*func)(int argc,char *argv[]);
} FUNCTION; } FUNCTION;
FUNCTION functions[] = { FUNCTION functions[] = {
...@@ -29,6 +29,10 @@ foreach (@ARGV) ...@@ -29,6 +29,10 @@ foreach (@ARGV)
$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n"; $str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";
if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/)) if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))
{ print "#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))\n${str}#endif\n"; } { 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$/)) elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) || ($_ =~ /^rsautl$/))
{ print "#ifndef OPENSSL_NO_RSA\n${str}#endif\n"; } { print "#ifndef OPENSSL_NO_RSA\n${str}#endif\n"; }
elsif ( ($_ =~ /^dsa$/) || ($_ =~ /^gendsa$/) || ($_ =~ /^dsaparam$/)) elsif ( ($_ =~ /^dsa$/) || ($_ =~ /^gendsa$/) || ($_ =~ /^dsaparam$/))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册