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:
4badd2b
)
Revert "Call ENGINE_init() before trying to use keys from engine"
author
Rich Salz
<rsalz@openssl.org>
Wed, 28 Sep 2016 18:39:32 +0000
(14:39 -0400)
committer
Rich Salz
<rsalz@openssl.org>
Wed, 28 Sep 2016 18:39:32 +0000
(14:39 -0400)
This reverts commit
4badd2b3c29c2c6c551c737c07a429a53d9d1a0d
.
This fails to call ENGINE_finish; an alternate fix is coming.
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 40401c12eff455208a2a9969c9ec33068c4793a8..9fdc3e0097c5576cd3b99a63deb3095f7c5debbd 100644
(file)
--- a/
apps/apps.c
+++ b/
apps/apps.c
@@
-1553,7
+1553,7
@@
ENGINE *setup_engine(BIO *err, const char *engine, int debug)
ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM, 0, 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(err, "can't use that engine\n");
ERR_print_errors(err);
ENGINE_free(e);