From 7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d Mon Sep 17 00:00:00 2001
From: djm <>
Date: Tue, 27 Jun 2006 05:07:03 +0000
Subject: resolve conflicts

---
 src/lib/libcrypto/engine/hw_aep.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/lib/libcrypto/engine/hw_aep.c')

diff --git a/src/lib/libcrypto/engine/hw_aep.c b/src/lib/libcrypto/engine/hw_aep.c
index 8b8380a582..5f1772ea99 100644
--- a/src/lib/libcrypto/engine/hw_aep.c
+++ b/src/lib/libcrypto/engine/hw_aep.c
@@ -474,6 +474,7 @@ static int aep_init(ENGINE *e)
 
 	if(aep_dso)
 		DSO_free(aep_dso);
+	aep_dso = NULL;
 		
 	p_AEP_OpenConnection    = NULL;
 	p_AEP_ModExp            = NULL;
-- 
cgit v1.2.3-55-g6feb