When closing, do not use close(). Also, if the closing call fails, do

not return immediately since that leaves a locked lock.

diff --git a/crypto/engine/hw_aep.c b/crypto/engine/hw_aep.c
index f25013f787cfd3bde1d9f1f12288922b01e0dd3c..b51824f0f9af0ed5a0d65983c33224417348a588 100644 (file)
--- a/crypto/engine/hw_aep.c
+++ b/crypto/engine/hw_aep.c
@@ -954,6 +954,7 @@ static AEP_RV aep_return_connection(AEP_CONNECTION_HNDL hConnection)
 static AEP_RV aep_close_connection(AEP_CONNECTION_HNDL hConnection)
        {
        int count;
 static AEP_RV aep_close_connection(AEP_CONNECTION_HNDL hConnection)
        {
        int count;

+       AEP_RV rv = AEP_R_OK;

 
        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
 
 
        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
 


@@ -962,21 +963,24 @@ static AEP_RV aep_close_connection(AEP_CONNECTION_HNDL hConnection)
                {
                if (aep_app_conn_table[count].conn_hndl == hConnection)
                        {
                {
                if (aep_app_conn_table[count].conn_hndl == hConnection)
                        {

+                       rv = p_AEP_CloseConnection(aep_app_conn_table[count].conn_hndl);
+                       if (rv != AEP_R_OK)
+                               goto end;

                        aep_app_conn_table[count].conn_state = NotConnected;
                        aep_app_conn_table[count].conn_state = NotConnected;

-                       close(aep_app_conn_table[count].conn_hndl);
+                       aep_app_conn_table[count].conn_hndl  = 0;

                        break;
                        }
                }
 
                        break;
                        }
                }
 

+ end:

        CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
        CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);

-
-       return AEP_R_OK;
+       return rv;

        }
 
 static AEP_RV aep_close_all_connections(int use_engine_lock, int *in_use)
        {
        int count;
        }
 
 static AEP_RV aep_close_all_connections(int use_engine_lock, int *in_use)
        {
        int count;

-       AEP_RV rv;
+       AEP_RV rv = AEP_R_OK;

 
        *in_use = 0;
        if (use_engine_lock) CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
 
        *in_use = 0;
        if (use_engine_lock) CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);


@@ -987,7 +991,7 @@ static AEP_RV aep_close_all_connections(int use_engine_lock, int *in_use)
                case Connected:
                        rv = p_AEP_CloseConnection(aep_app_conn_table[count].conn_hndl);
                        if (rv != AEP_R_OK)
                case Connected:
                        rv = p_AEP_CloseConnection(aep_app_conn_table[count].conn_hndl);
                        if (rv != AEP_R_OK)

-                               return rv;
+                               goto end;

                        aep_app_conn_table[count].conn_state = NotConnected;
                        aep_app_conn_table[count].conn_hndl  = 0;
                        break;
                        aep_app_conn_table[count].conn_state = NotConnected;
                        aep_app_conn_table[count].conn_hndl  = 0;
                        break;


@@ -998,8 +1002,9 @@ static AEP_RV aep_close_all_connections(int use_engine_lock, int *in_use)
                        break;
                        }
                }
                        break;
                        }
                }

+ end:

        if (use_engine_lock) CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
        if (use_engine_lock) CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);

-       return AEP_R_OK;
+       return rv;

        }
 
 /*BigNum call back functions, used to convert OpenSSL bignums into AEP bignums.
        }
 
 /*BigNum call back functions, used to convert OpenSSL bignums into AEP bignums.