summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ts
diff options
context:
space:
mode:
authortb <>2018-04-14 07:18:37 +0000
committertb <>2018-04-14 07:18:37 +0000
commit1e9445503c3ea65f8c138ab5dc555db0f1db91a7 (patch)
tree27f20ba7d1bd380c7995e6d349ae1b5f8b90cc6d /src/lib/libcrypto/ts
parenta32b35170819e9b07e0183d19aee21b9a246943b (diff)
downloadopenbsd-1e9445503c3ea65f8c138ab5dc555db0f1db91a7.tar.gz
openbsd-1e9445503c3ea65f8c138ab5dc555db0f1db91a7.tar.bz2
openbsd-1e9445503c3ea65f8c138ab5dc555db0f1db91a7.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/ts')
-rw-r--r--src/lib/libcrypto/ts/ts_conf.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libcrypto/ts/ts_conf.c b/src/lib/libcrypto/ts/ts_conf.c
index c223aa3d46..41d185ee5a 100644
--- a/src/lib/libcrypto/ts/ts_conf.c
+++ b/src/lib/libcrypto/ts/ts_conf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ts_conf.c,v 1.10 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: ts_conf.c,v 1.11 2018/04/14 07:18:37 tb Exp $ */
2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL 2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
3 * project 2002. 3 * project 2002.
4 */ 4 */
@@ -248,8 +248,7 @@ err:
248 TSerror(TS_R_COULD_NOT_SET_ENGINE); 248 TSerror(TS_R_COULD_NOT_SET_ENGINE);
249 ERR_asprintf_error_data("engine:%s", name); 249 ERR_asprintf_error_data("engine:%s", name);
250 } 250 }
251 if (e) 251 ENGINE_free(e);
252 ENGINE_free(e);
253 return ret; 252 return ret;
254} 253}
255 254