diff options
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/a_digest.c | 5 | ||||
| -rw-r--r-- | crypto/asn1/a_sign.c | 6 | ||||
| -rw-r--r-- | crypto/asn1/a_verify.c | 3 | ||||
| -rw-r--r-- | crypto/asn1/asn_pack.c | 5 |
4 files changed, 8 insertions, 11 deletions
diff --git a/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c index b728e5c0e2..d00d9e22b1 100644 --- a/crypto/asn1/a_digest.c +++ b/crypto/asn1/a_digest.c @@ -72,9 +72,8 @@ #ifndef NO_ASN1_OLD -int ASN1_digest(int (*i2d)(void *, unsigned char **), - const EVP_MD *type, char *data, unsigned char *md, - unsigned int *len) +int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data, + unsigned char *md, unsigned int *len) { int i; unsigned char *str,*p; diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c index 2542f750a2..042682a061 100644 --- a/crypto/asn1/a_sign.c +++ b/crypto/asn1/a_sign.c @@ -126,9 +126,9 @@ #ifndef NO_ASN1_OLD -int ASN1_sign(int (*i2d)(void *, unsigned char **), X509_ALGOR *algor1, - X509_ALGOR *algor2, ASN1_BIT_STRING *signature, char *data, - EVP_PKEY *pkey, const EVP_MD *type) +int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2, + ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey, + const EVP_MD *type) { EVP_MD_CTX ctx; unsigned char *p,*buf_in=NULL,*buf_out=NULL; diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c index d34e287177..e7ba32f3f1 100644 --- a/crypto/asn1/a_verify.c +++ b/crypto/asn1/a_verify.c @@ -73,8 +73,7 @@ #ifndef NO_ASN1_OLD -int ASN1_verify(int (*i2d)(void *, unsigned char **), - X509_ALGOR *a, ASN1_BIT_STRING *signature, +int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *a, ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey) { EVP_MD_CTX ctx; diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c index 7421e69aed..7aefde21ef 100644 --- a/crypto/asn1/asn_pack.c +++ b/crypto/asn1/asn_pack.c @@ -82,7 +82,7 @@ STACK *ASN1_seq_unpack(const unsigned char *buf, int len, * OPENSSL_malloc'ed buffer */ -unsigned char *ASN1_seq_pack(STACK *safes, int (*i2d)(void *,unsigned char **), +unsigned char *ASN1_seq_pack(STACK *safes, i2d_of_void *i2d, unsigned char **buf, int *len) { int safelen; @@ -119,8 +119,7 @@ void *ASN1_unpack_string (ASN1_STRING *oct, d2i_of_void *d2i) /* Pack an ASN1 object into an ASN1_STRING */ -ASN1_STRING *ASN1_pack_string(void *obj, int (*i2d)(void *,unsigned char **), - ASN1_STRING **oct) +ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d, ASN1_STRING **oct) { unsigned char *p; ASN1_STRING *octmp; |