Commit 8bb826ee authored by Ben Laurie's avatar Ben Laurie
Browse files

Consistency.

parent 5d1430f3

crypto/asn1/a_digest.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

crypto/asn1/a_sign.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

crypto/asn1/a_verify.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

crypto/asn1/asn_pack.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

crypto/ocsp/ocsp.h

+1 −2
Original line number Diff line number Diff line
@@ -466,8 +466,7 @@ int OCSP_basic_sign(OCSP_BASICRESP *brsp, 
			X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,

			STACK_OF(X509) *certs, unsigned long flags);



ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s,

				int (*i2d)(void *,unsigned char **), 

ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,

				void *data, STACK_OF(ASN1_OBJECT) *sk);

#define ASN1_STRING_encode_of(type,s,i2d,data,sk) \

((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))ASN1_STRING_encode)(s,i2d,data,sk)