summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/engine/eng_cnf.c
diff options
context:
space:
mode:
authortb <>2018-04-14 07:18:37 +0000
committertb <>2018-04-14 07:18:37 +0000
commite2303054291a1a9cf6ea192af2df63e77c3f65fd (patch)
tree27f20ba7d1bd380c7995e6d349ae1b5f8b90cc6d /src/lib/libcrypto/engine/eng_cnf.c
parent0c5418014797b1fadca3f270eb2f140fd6f5bdf8 (diff)
downloadopenbsd-e2303054291a1a9cf6ea192af2df63e77c3f65fd.tar.gz
openbsd-e2303054291a1a9cf6ea192af2df63e77c3f65fd.tar.bz2
openbsd-e2303054291a1a9cf6ea192af2df63e77c3f65fd.zip
Make ENGINE_free() succeed on NULL. Matches OpenSSL's behavior and
simplifies the caller side. tested by & ok inoguchi; discussed with schwarze
Diffstat (limited to 'src/lib/libcrypto/engine/eng_cnf.c')
-rw-r--r--src/lib/libcrypto/engine/eng_cnf.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libcrypto/engine/eng_cnf.c b/src/lib/libcrypto/engine/eng_cnf.c
index 2ac077d492..24358af8cd 100644
--- a/src/lib/libcrypto/engine/eng_cnf.c
+++ b/src/lib/libcrypto/engine/eng_cnf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: eng_cnf.c,v 1.14 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: eng_cnf.c,v 1.15 2018/04/14 07:18:37 tb Exp $ */
2/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL 2/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
3 * project 2001. 3 * project 2001.
4 */ 4 */
@@ -200,8 +200,7 @@ err:
200 "section=%s, name=%s, value=%s", 200 "section=%s, name=%s, value=%s",
201 ecmd->section, ecmd->name, ecmd->value); 201 ecmd->section, ecmd->name, ecmd->value);
202 } 202 }
203 if (e) 203 ENGINE_free(e);
204 ENGINE_free(e);
205 return ret; 204 return ret;
206} 205}
207 206