typedef enum OPTION_choice {
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
- OPT_B, OPT_D, OPT_F, OPT_O, OPT_P, OPT_V, OPT_A
+ OPT_B, OPT_D, OPT_E, OPT_F, OPT_O, OPT_P, OPT_V, OPT_A
} OPTION_CHOICE;
OPTIONS version_options[] = {
{"a", OPT_A, '-', "Show all data"},
{"b", OPT_B, '-', "Show build date"},
{"d", OPT_D, '-', "Show configuration directory"},
+ {"e", OPT_E, '-', "Show engines directory"},
{"f", OPT_F, '-', "Show compiler flags used"},
{"o", OPT_O, '-', "Show some internal datatype options"},
{"p", OPT_P, '-', "Show target build platform"},
{
int ret = 1, dirty = 0;
int cflags = 0, version = 0, date = 0, options = 0, platform = 0, dir = 0;
+ int engdir = 0;
char *prog;
OPTION_CHOICE o;
case OPT_D:
dirty = dir = 1;
break;
+ case OPT_E:
+ dirty = engdir = 1;
+ break;
case OPT_F:
dirty = cflags = 1;
break;
dirty = version = 1;
break;
case OPT_A:
- cflags = version = date = platform = dir = 1;
+ cflags = version = date = platform = dir = engdir = 1;
break;
}
}
version = 1;
if (version) {
- if (SSLeay() == SSLEAY_VERSION_NUMBER) {
- printf("%s\n", SSLeay_version(SSLEAY_VERSION));
+ if (OpenSSL_version_num() == OPENSSL_VERSION_NUMBER) {
+ printf("%s\n", OpenSSL_version(OPENSSL_VERSION));
} else {
printf("%s (Library: %s)\n",
- OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
+ OPENSSL_VERSION_TEXT, OpenSSL_version(OPENSSL_VERSION));
}
}
if (date)
- printf("%s\n", SSLeay_version(SSLEAY_BUILT_ON));
+ printf("%s\n", OpenSSL_version(OPENSSL_BUILT_ON));
if (platform)
- printf("%s\n", SSLeay_version(SSLEAY_PLATFORM));
+ printf("%s\n", OpenSSL_version(OPENSSL_PLATFORM));
if (options) {
printf("options: ");
printf("%s ", BN_options());
printf("%s ", DES_options());
#endif
#ifndef OPENSSL_NO_IDEA
- printf("%s ", idea_options());
+ printf("%s ", IDEA_options());
#endif
#ifndef OPENSSL_NO_BF
printf("%s ", BF_options());
printf("\n");
}
if (cflags)
- printf("%s\n", SSLeay_version(SSLEAY_CFLAGS));
+ printf("%s\n", OpenSSL_version(OPENSSL_CFLAGS));
if (dir)
- printf("%s\n", SSLeay_version(SSLEAY_DIR));
+ printf("%s\n", OpenSSL_version(OPENSSL_DIR));
+ if (engdir)
+ printf("%s\n", OpenSSL_version(OPENSSL_ENGINES_DIR));
ret = 0;
end:
return (ret);