diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/engine/eng_cnf.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libcrypto/engine/eng_cnf.c b/src/lib/libcrypto/engine/eng_cnf.c index 8417ddaaef..08066cea59 100644 --- a/src/lib/libcrypto/engine/eng_cnf.c +++ b/src/lib/libcrypto/engine/eng_cnf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* eng_cnf.c */ | 1 | /* eng_cnf.c */ |
2 | /* Written by Stephen Henson (shenson@bigfoot.com) for the OpenSSL | 2 | /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
5 | /* ==================================================================== | 5 | /* ==================================================================== |
@@ -98,7 +98,7 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf) | |||
98 | CONF_VALUE *ecmd; | 98 | CONF_VALUE *ecmd; |
99 | char *ctrlname, *ctrlvalue; | 99 | char *ctrlname, *ctrlvalue; |
100 | ENGINE *e = NULL; | 100 | ENGINE *e = NULL; |
101 | int soft = 0; | 101 | int soft = 0; |
102 | 102 | ||
103 | name = skip_dot(name); | 103 | name = skip_dot(name); |
104 | #ifdef ENGINE_CONF_DEBUG | 104 | #ifdef ENGINE_CONF_DEBUG |
@@ -127,8 +127,8 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf) | |||
127 | /* Override engine name to use */ | 127 | /* Override engine name to use */ |
128 | if (!strcmp(ctrlname, "engine_id")) | 128 | if (!strcmp(ctrlname, "engine_id")) |
129 | name = ctrlvalue; | 129 | name = ctrlvalue; |
130 | else if (!strcmp(ctrlname, "soft_load")) | 130 | else if (!strcmp(ctrlname, "soft_load")) |
131 | soft = 1; | 131 | soft = 1; |
132 | /* Load a dynamic ENGINE */ | 132 | /* Load a dynamic ENGINE */ |
133 | else if (!strcmp(ctrlname, "dynamic_path")) | 133 | else if (!strcmp(ctrlname, "dynamic_path")) |
134 | { | 134 | { |
@@ -151,11 +151,11 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf) | |||
151 | if (!e) | 151 | if (!e) |
152 | { | 152 | { |
153 | e = ENGINE_by_id(name); | 153 | e = ENGINE_by_id(name); |
154 | if (!e && soft) | 154 | if (!e && soft) |
155 | { | 155 | { |
156 | ERR_clear_error(); | 156 | ERR_clear_error(); |
157 | return 1; | 157 | return 1; |
158 | } | 158 | } |
159 | if (!e) | 159 | if (!e) |
160 | return 0; | 160 | return 0; |
161 | } | 161 | } |