2 files changed, 4 insertions, 10 deletions

diff --git a/src/lib/libcrypto/engine/eng_list.c b/src/lib/libcrypto/engine/eng_list.c
index 30f09adc73..fc1d16b183 100644
--- a/src/lib/libcrypto/engine/eng_list.c
+++ b/src/lib/libcrypto/engine/eng_list.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_list.c,v 1.20 2015/06/19 06:32:43 bcook Exp $ */
+/* $OpenBSD: eng_list.c,v 1.21 2015/07/19 00:56:48 bcook Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -92,11 +92,8 @@ engine_list_cleanup(void)
 {
         ENGINE *iterator = engine_list_head;
 
-        while (iterator != NULL) {
-                ENGINE_remove(iterator);
+        while (iterator != NULL && ENGINE_remove(iterator))
                 iterator = engine_list_head;
-        }
-        return;
 }
 
 /* These static functions starting with a lower case "engine_" always
diff --git a/src/lib/libssl/src/crypto/engine/eng_list.c b/src/lib/libssl/src/crypto/engine/eng_list.c
index 30f09adc73..fc1d16b183 100644
--- a/src/lib/libssl/src/crypto/engine/eng_list.c
+++ b/src/lib/libssl/src/crypto/engine/eng_list.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_list.c,v 1.20 2015/06/19 06:32:43 bcook Exp $ */
+/* $OpenBSD: eng_list.c,v 1.21 2015/07/19 00:56:48 bcook Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -92,11 +92,8 @@ engine_list_cleanup(void)
 {
         ENGINE *iterator = engine_list_head;
 
-        while (iterator != NULL) {
-                ENGINE_remove(iterator);
+        while (iterator != NULL && ENGINE_remove(iterator))
                 iterator = engine_list_head;
-        }
-        return;
 }
 
 /* These static functions starting with a lower case "engine_" always