diff options
Diffstat (limited to 'src/usr.bin/openssl/openssl.c')
-rw-r--r-- | src/usr.bin/openssl/openssl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c index 9db7e5b4eb..e842d6cc65 100644 --- a/src/usr.bin/openssl/openssl.c +++ b/src/usr.bin/openssl/openssl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: openssl.c,v 1.16 2015/10/10 20:18:30 deraadt Exp $ */ | 1 | /* $OpenBSD: openssl.c,v 1.17 2015/10/10 22:28:51 doug Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -137,6 +137,8 @@ | |||
137 | #define FUNC_TYPE_MD_ALG 5 | 137 | #define FUNC_TYPE_MD_ALG 5 |
138 | #define FUNC_TYPE_CIPHER_ALG 6 | 138 | #define FUNC_TYPE_CIPHER_ALG 6 |
139 | 139 | ||
140 | int single_execution = 0; | ||
141 | |||
140 | typedef struct { | 142 | typedef struct { |
141 | int type; | 143 | int type; |
142 | const char *name; | 144 | const char *name; |
@@ -499,6 +501,8 @@ main(int argc, char **argv) | |||
499 | fp = lh_FUNCTION_retrieve(prog, &f); | 501 | fp = lh_FUNCTION_retrieve(prog, &f); |
500 | if (fp != NULL) { | 502 | if (fp != NULL) { |
501 | argv[0] = pname; | 503 | argv[0] = pname; |
504 | |||
505 | single_execution = 1; | ||
502 | ret = fp->func(argc, argv); | 506 | ret = fp->func(argc, argv); |
503 | goto end; | 507 | goto end; |
504 | } | 508 | } |
@@ -509,6 +513,8 @@ main(int argc, char **argv) | |||
509 | if (argc != 1) { | 513 | if (argc != 1) { |
510 | argc--; | 514 | argc--; |
511 | argv++; | 515 | argv++; |
516 | |||
517 | single_execution = 1; | ||
512 | ret = do_cmd(prog, argc, argv); | 518 | ret = do_cmd(prog, argc, argv); |
513 | if (ret < 0) | 519 | if (ret < 0) |
514 | ret = 0; | 520 | ret = 0; |