Index: openssl/engines/e_4758cca.c |
=================================================================== |
--- openssl/engines/e_4758cca.c (revision 105093) |
+++ openssl/engines/e_4758cca.c (working copy) |
@@ -92,7 +92,7 @@ |
static int cca_rsa_sign(int type, const unsigned char *m, unsigned int m_len, |
unsigned char *sigret, unsigned int *siglen, const RSA *rsa); |
static int cca_rsa_verify(int dtype, const unsigned char *m, unsigned int m_len, |
- unsigned char *sigbuf, unsigned int siglen, const RSA *rsa); |
+ const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa); |
/* utility functions */ |
/*-----------------------*/ |
@@ -108,7 +108,7 @@ |
/* RAND number functions */ |
/*-----------------------*/ |
-static int cca_get_random_bytes(unsigned char*, int ); |
+static int cca_get_random_bytes(unsigned char*, int); |
static int cca_random_status(void); |
#ifndef OPENSSL_NO_RSA |
@@ -482,10 +482,6 @@ |
err: |
if (keyToken) |
OPENSSL_free(keyToken); |
- if (res) |
- EVP_PKEY_free(res); |
- if (rtmp) |
- RSA_free(rtmp); |
return NULL; |
} |
@@ -560,10 +556,6 @@ |
err: |
if (keyToken) |
OPENSSL_free(keyToken); |
- if (res) |
- EVP_PKEY_free(res); |
- if (rtmp) |
- RSA_free(rtmp); |
return NULL; |
} |
@@ -626,7 +618,7 @@ |
#define SSL_SIG_LEN 36 |
static int cca_rsa_verify(int type, const unsigned char *m, unsigned int m_len, |
- unsigned char *sigbuf, unsigned int siglen, const RSA *rsa) |
+ const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa) |
{ |
long returnCode; |
long reasonCode; |
@@ -735,7 +727,8 @@ |
digitalSignatureVerify(&returnCode, &reasonCode, &exitDataLength, |
exitData, &ruleArrayLength, ruleArray, &keyTokenLength, |
- keyToken, &length, hashBuffer, &lsiglen, sigbuf); |
+ keyToken, &length, hashBuffer, &lsiglen, |
+ (unsigned char *)sigbuf); |
if (type == NID_sha1 || type == NID_md5) |
{ |