Merge remote-tracking branch 'trevp/pemfix' into trev-pem-fix

[openssl.git] / engines / e_cswift.c

diff --git a/engines/e_cswift.c b/engines/e_cswift.c
index 80d7894eba3db2d488ca0e9aab224396607e75b9..2e64ff32770dbf130d3dda10e7e465db88226045 100644 (file)
--- a/engines/e_cswift.c
+++ b/engines/e_cswift.c
@@ -141,7 +141,7 @@ static int cswift_mod_exp_dh(const DH *dh, BIGNUM *r,
 #endif
 
 /* RAND stuff */
-static int cswift_rand_bytes(unsigned char *buf, size_t num);
+static int cswift_rand_bytes(unsigned char *buf, int num);
 static int cswift_rand_status(void);
 
 /* The definitions for control commands specific to this engine */
@@ -811,7 +811,6 @@ static DSA_SIG *cswift_dsa_sign(const unsigned char *dgst, int dlen, DSA *dsa)
        SW_PARAM sw_param;
        SW_STATUS sw_status;
        SW_LARGENUMBER arg, res;
-       unsigned char *ptr;
        BN_CTX *ctx;
        BIGNUM *dsa_p = NULL;
        BIGNUM *dsa_q = NULL;
@@ -899,7 +898,6 @@ static DSA_SIG *cswift_dsa_sign(const unsigned char *dgst, int dlen, DSA *dsa)
                goto err;
                }
        /* Convert the response */
-       ptr = (unsigned char *)result->d;
        if((to_return = DSA_SIG_new()) == NULL)
                goto err;
        to_return->r = BN_bin2bn((unsigned char *)result->d, 20, NULL);
@@ -1040,7 +1038,7 @@ static int cswift_mod_exp_dh(const DH *dh, BIGNUM *r,
 #endif
 
 /* Random bytes are good */
-static int cswift_rand_bytes(unsigned char *buf, size_t num)
+static int cswift_rand_bytes(unsigned char *buf, int num)
 {
        SW_CONTEXT_HANDLE hac;
        SW_STATUS swrc;