make update (libeay.num has been edited to match 0.9.7-stable)
[openssl.git] / crypto / engine / hw_aep.c
index cefd3f0..cf4507c 100644 (file)
@@ -92,6 +92,7 @@ static int aep_destroy(ENGINE *e);
 
 static AEP_RV aep_get_connection(AEP_CONNECTION_HNDL_PTR hConnection);
 static AEP_RV aep_return_connection(AEP_CONNECTION_HNDL hConnection);
+static AEP_RV aep_close_connection(AEP_CONNECTION_HNDL hConnection);
 static AEP_RV aep_close_all_connections(int use_engine_lock, int *in_use);
 
 /* BIGNUM stuff */
@@ -136,8 +137,8 @@ static int aep_rand_status(void);
 #endif
 
 /* Bignum conversion stuff */
-static AEP_RV GetBigNumSize(void* ArbBigNum, AEP_U32* BigNumSize);
-static AEP_RV MakeAEPBigNum(void* ArbBigNum, AEP_U32 BigNumSize,
+static AEP_RV GetBigNumSize(AEP_VOID_PTR ArbBigNum, AEP_U32* BigNumSize);
+static AEP_RV MakeAEPBigNum(AEP_VOID_PTR ArbBigNum, AEP_U32 BigNumSize,
        unsigned char* AEP_BigNum);
 static AEP_RV ConvertAEPBigNum(void* ArbBigNum, AEP_U32 BigNumSize,
        unsigned char* AEP_BigNum);
@@ -649,9 +650,6 @@ static int aep_rand(unsigned char *buf,int len )
        AEP_RV rv = AEP_R_OK;
        AEP_CONNECTION_HNDL hConnection;
 
-       int to_return = 0;
-
-  
        CRYPTO_w_lock(CRYPTO_LOCK_RAND);
 
        /*Can the request be serviced with what's already in the buffer?*/
@@ -950,9 +948,10 @@ static AEP_RV aep_return_connection(AEP_CONNECTION_HNDL hConnection)
        return AEP_R_OK;
        }
 
-static int aep_close_connection(unsigned int hConnection)
+static AEP_RV aep_close_connection(AEP_CONNECTION_HNDL hConnection)
        {
        int count;
+       AEP_RV rv = AEP_R_OK;
 
        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
 
@@ -961,21 +960,24 @@ static int aep_close_connection(unsigned int 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;
-                       close(aep_app_conn_table[count].conn_hndl);
+                       aep_app_conn_table[count].conn_hndl  = 0;
                        break;
                        }
                }
 
+ end:
        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;
-       AEP_RV rv;
+       AEP_RV rv = AEP_R_OK;
 
        *in_use = 0;
        if (use_engine_lock) CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
@@ -986,7 +988,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)
-                               return rv;
+                               goto end;
                        aep_app_conn_table[count].conn_state = NotConnected;
                        aep_app_conn_table[count].conn_hndl  = 0;
                        break;
@@ -997,14 +999,15 @@ static AEP_RV aep_close_all_connections(int use_engine_lock, int *in_use)
                        break;
                        }
                }
+ end:
        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.
   Note only 32bit Openssl build support*/
 
-static AEP_RV GetBigNumSize(void* ArbBigNum, AEP_U32* BigNumSize)
+static AEP_RV GetBigNumSize(AEP_VOID_PTR ArbBigNum, AEP_U32* BigNumSize)
        {
        BIGNUM* bn;
 
@@ -1022,7 +1025,7 @@ static AEP_RV GetBigNumSize(void* ArbBigNum, AEP_U32* BigNumSize)
        return AEP_R_OK;
        }
 
-static AEP_RV MakeAEPBigNum(void* ArbBigNum, AEP_U32 BigNumSize,
+static AEP_RV MakeAEPBigNum(AEP_VOID_PTR ArbBigNum, AEP_U32 BigNumSize,
        unsigned char* AEP_BigNum)
        {
        BIGNUM* bn;
@@ -1044,8 +1047,8 @@ static AEP_RV MakeAEPBigNum(void* ArbBigNum, AEP_U32 BigNumSize,
                {
                buf = (unsigned char*)&bn->d[i];
 
-               *((AEP_U32*)AEP_BigNum) =
-                       (AEP_U32) ((unsigned) buf[1] << 8 | buf[0]) |
+               *((AEP_U32*)AEP_BigNum) = (AEP_U32)
+                       ((unsigned) buf[1] << 8 | buf[0]) |
                        ((unsigned) buf[3] << 8 | buf[2])  << 16;
 
                AEP_BigNum += 4;