|
 |
557317 |
diff -up openssl-1.0.2a/apps/version.c.version-add-engines openssl-1.0.2a/apps/version.c
|
|
|
557317 |
--- openssl-1.0.2a/apps/version.c.version-add-engines 2015-04-09 18:16:42.345756005 +0200
|
|
|
557317 |
+++ openssl-1.0.2a/apps/version.c 2015-04-09 18:16:36.573622667 +0200
|
|
|
557317 |
@@ -131,6 +131,7 @@
|
|
|
557317 |
#ifndef OPENSSL_NO_BF
|
|
|
557317 |
# include <openssl/blowfish.h>
|
|
|
557317 |
#endif
|
|
|
557317 |
+#include <openssl/engine.h>
|
|
|
557317 |
|
|
|
557317 |
#undef PROG
|
|
|
557317 |
#define PROG version_main
|
|
|
557317 |
@@ -140,7 +141,8 @@ int MAIN(int, char **);
|
|
|
557317 |
int MAIN(int argc, char **argv)
|
|
|
557317 |
{
|
|
|
557317 |
int i, ret = 0;
|
|
|
557317 |
- int cflags = 0, version = 0, date = 0, options = 0, platform = 0, dir = 0;
|
|
|
557317 |
+ int cflags = 0, version = 0, date = 0, options = 0, platform = 0, dir =
|
|
|
557317 |
+ 0, engines = 0;
|
|
|
557317 |
|
|
|
557317 |
apps_startup();
|
|
|
557317 |
|
|
|
557317 |
@@ -164,7 +166,7 @@ int MAIN(int argc, char **argv)
|
|
|
557317 |
else if (strcmp(argv[i], "-d") == 0)
|
|
|
557317 |
dir = 1;
|
|
|
557317 |
else if (strcmp(argv[i], "-a") == 0)
|
|
|
557317 |
- date = version = cflags = options = platform = dir = 1;
|
|
|
557317 |
+ date = version = cflags = options = platform = dir = engines = 1;
|
|
|
557317 |
else {
|
|
|
557317 |
BIO_printf(bio_err, "usage:version -[avbofpd]\n");
|
|
|
557317 |
ret = 1;
|
|
|
557317 |
@@ -208,6 +210,16 @@ int MAIN(int argc, char **argv)
|
|
|
557317 |
printf("%s\n", SSLeay_version(SSLEAY_CFLAGS));
|
|
|
557317 |
if (dir)
|
|
|
557317 |
printf("%s\n", SSLeay_version(SSLEAY_DIR));
|
|
|
557317 |
+ if (engines) {
|
|
|
557317 |
+ ENGINE *e;
|
|
|
557317 |
+ printf("engines: ");
|
|
|
557317 |
+ e = ENGINE_get_first();
|
|
|
557317 |
+ while (e) {
|
|
|
557317 |
+ printf("%s ", ENGINE_get_id(e));
|
|
|
557317 |
+ e = ENGINE_get_next(e);
|
|
|
557317 |
+ }
|
|
|
557317 |
+ printf("\n");
|
|
|
557317 |
+ }
|
|
|
557317 |
end:
|
|
|
557317 |
apps_shutdown();
|
|
|
557317 |
OPENSSL_EXIT(ret);
|