Reorder inclusion of header files:

[openssl.git] / crypto / engine / hw_sureware.c

diff --git a/crypto/engine/hw_sureware.c b/crypto/engine/hw_sureware.c
index be1414fe12023d8301630bd04779e019dc72e4c6..89f708661d2c5d057d64c418a581ec0d4713d9c5 100644 (file)
--- a/crypto/engine/hw_sureware.c
+++ b/crypto/engine/hw_sureware.c
@@ -51,9 +51,9 @@
 ====================================================================*/
 
 #include <stdio.h>
+#include "cryptlib.h"
 #include <openssl/crypto.h>
 #include <openssl/pem.h>
-#include "cryptlib.h"
 #include <openssl/dso.h>
 #include "eng_int.h"
 #include "engine.h"
@@ -95,10 +95,10 @@ static EVP_PKEY *surewarehk_load_privkey(ENGINE *e, const char *key_id,
 static EVP_PKEY *surewarehk_load_pubkey(ENGINE *e, const char *key_id,
        UI_METHOD *ui_method, void *callback_data);
 static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-       int index_,long argl, void *argp);
+       int idx,long argl, void *argp);
 #if 0
 static void surewarehk_dh_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-       int index_,long argl, void *argp);
+       int idx,long argl, void *argp);
 #endif
 
 #ifndef OPENSSL_NO_RSA
@@ -667,7 +667,9 @@ static EVP_PKEY* sureware_load_public(ENGINE *e,const char *key_id,char *hptr,un
                if (!rsatmp->e || rsatmp->e->dmax!=(int)(el/sizeof(BN_ULONG))|| 
                        !rsatmp->n || rsatmp->n->dmax!=(int)(el/sizeof(BN_ULONG)))
                        goto err;
-               ret=p_surewarehk_Load_Rsa_Pubkey(msg,key_id,el,rsatmp->n->d, rsatmp->e->d);
+               ret=p_surewarehk_Load_Rsa_Pubkey(msg,key_id,el,
+                                                (unsigned long *)rsatmp->n->d,
+                                                (unsigned long *)rsatmp->e->d);
                surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,ret);
                if (ret!=1)
                {
@@ -708,10 +710,10 @@ static EVP_PKEY* sureware_load_public(ENGINE *e,const char *key_id,char *hptr,un
                        goto err;
 
                ret=p_surewarehk_Load_Dsa_Pubkey(msg,key_id,el,
-                                                                               dsatmp->pub_key->d, 
-                                                                               dsatmp->p->d,
-                                                                               dsatmp->q->d,
-                                                                               dsatmp->g->d);
+                                                (unsigned long *)dsatmp->pub_key->d, 
+                                                (unsigned long *)dsatmp->p->d,
+                                                (unsigned long *)dsatmp->q->d,
+                                                (unsigned long *)dsatmp->g->d);
                surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,ret);
                if (ret!=1)
                {
@@ -814,7 +816,7 @@ static EVP_PKEY *surewarehk_load_pubkey(ENGINE *e, const char *key_id,
 /* This cleans up an RSA/DSA KM key(do not destroy the key into the hardware)
 , called when ex_data is freed */
 static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-       int index_,long argl, void *argp)
+       int idx,long argl, void *argp)
 {
        if(!p_surewarehk_Free)
        {
@@ -829,7 +831,7 @@ static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
 /* This cleans up an DH KM key (destroys the key into hardware), 
 called when ex_data is freed */
 static void surewarehk_dh_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-       int index_,long argl, void *argp)
+       int idx,long argl, void *argp)
 {
        if(!p_surewarehk_Free)
        {
@@ -979,7 +981,10 @@ static     DSA_SIG * surewarehk_dsa_do_sign(const unsigned char *from, int flen, DSA
                if (!psign->r || psign->r->dmax!=20/sizeof(BN_ULONG) ||
                        !psign->s || psign->s->dmax!=20/sizeof(BN_ULONG))
                        goto err;
-               ret=p_surewarehk_Dsa_Sign(msg,flen,from,psign->r->d,psign->s->d,hptr);
+               ret=p_surewarehk_Dsa_Sign(msg,flen,from,
+                                         (unsigned long *)psign->r->d,
+                                         (unsigned long *)psign->s->d,
+                                         hptr);
                surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_DSA_DO_SIGN,ret);
        }
        psign->r->top=20/sizeof(BN_ULONG);
@@ -1012,8 +1017,14 @@ static int surewarehk_modexp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                if (r && r->dmax==m->top)
                {
                        /* do it*/
-                       ret=p_surewarehk_Mod_Exp(msg,m->top*sizeof(BN_ULONG),m->d,p->top*sizeof(BN_ULONG),
-                                                                       p->d,a->top*sizeof(BN_ULONG),a->d,r->d);
+                       ret=p_surewarehk_Mod_Exp(msg,
+                                                m->top*sizeof(BN_ULONG),
+                                                (unsigned long *)m->d,
+                                                p->top*sizeof(BN_ULONG),
+                                                (unsigned long *)p->d,
+                                                a->top*sizeof(BN_ULONG),
+                                                (unsigned long *)a->d,
+                                                (unsigned long *)r->d);
                        surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_MOD_EXP,ret);
                        if (ret==1)
                        {