projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0a72002
)
Revert "Call ENGINE_init() before trying to use keys from engine"
author
Rich Salz
<rsalz@openssl.org>
Wed, 28 Sep 2016 18:40:25 +0000
(14:40 -0400)
committer
Rich Salz
<rsalz@openssl.org>
Wed, 28 Sep 2016 18:40:25 +0000
(14:40 -0400)
This reverts commit
0a72002993b8619fd0642d19af3364bafbd9a06c
.
This fails to call ENGINE_finish; an alternate fix is forthcoming.
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
apps/apps.c
patch
|
blob
|
history
diff --git
a/apps/apps.c
b/apps/apps.c
index 9a58f17b671aa4963bd92b9ab00d3b726b906378..b2877480a0b7199d46e98ac7978bf662449875e5 100644
(file)
--- a/
apps/apps.c
+++ b/
apps/apps.c
@@
-1269,7
+1269,7
@@
ENGINE *setup_engine(const char *engine, int debug)
ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM, 0, bio_err, 0);
}
ENGINE_ctrl_cmd(e, "SET_USER_INTERFACE", 0, ui_method, 0, 1);
- if (!ENGINE_
init(e) || !ENGINE_
set_default(e, ENGINE_METHOD_ALL)) {
+ if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
BIO_printf(bio_err, "can't use that engine\n");
ERR_print_errors(bio_err);
ENGINE_free(e);