summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/engine/eng_aesni.c
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/engine/eng_aesni.c
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/engine/eng_aesni.c')
-rw-r--r--src/lib/libcrypto/engine/eng_aesni.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/engine/eng_aesni.c b/src/lib/libcrypto/engine/eng_aesni.c
index cd14bbc8cd..586f74792a 100644
--- a/src/lib/libcrypto/engine/eng_aesni.c
+++ b/src/lib/libcrypto/engine/eng_aesni.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: eng_aesni.c,v 1.10 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: eng_aesni.c,v 1.11 2018/04/14 07:18:37 tb Exp $ */
2/* 2/*
3 * Support for Intel AES-NI intruction set 3 * Support for Intel AES-NI intruction set
4 * Author: Huang Ying <ying.huang@intel.com> 4 * Author: Huang Ying <ying.huang@intel.com>
@@ -102,12 +102,12 @@ void ENGINE_load_aesni(void)
102/* On non-x86 CPUs it just returns. */ 102/* On non-x86 CPUs it just returns. */
103#ifdef COMPILE_HW_AESNI 103#ifdef COMPILE_HW_AESNI
104 ENGINE *toadd = ENGINE_aesni(); 104 ENGINE *toadd = ENGINE_aesni();
105 if (!toadd) 105 if (toadd == NULL)
106 return; 106 return;
107 ENGINE_add (toadd); 107 ENGINE_add(toadd);
108 ENGINE_register_complete (toadd); 108 ENGINE_register_complete(toadd);
109 ENGINE_free (toadd); 109 ENGINE_free(toadd);
110 ERR_clear_error (); 110 ERR_clear_error();
111#endif 111#endif
112} 112}
113 113