Commit 6c29853b authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 1644 

Submitted by: steve@openssl.org

Fix to make DHparams_dup() et al work in C++.

For 1.0 fix the final argument to ASN1_dup() so it is void *. Replace some
*_dup macros with functions.
parent 2e9802b7

crypto/asn1/a_dup.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 


#ifndef NO_OLD_ASN1



void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x)

void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x)

	{

	unsigned char *b,*p;

	const unsigned char *p2;

crypto/asn1/asn1.h

+1 −1
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ int ASN1_put_eoc(unsigned char **pp); 
int ASN1_object_size(int constructed, int length, int tag);



/* Used to implement other functions */

void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x);

void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x);



#define ASN1_dup_of(type,i2d,d2i,x) \

    ((type*)ASN1_dup(CHECKED_I2D_OF(type, i2d), \

crypto/dh/dh.h

+2 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ struct dh_st 
   this for backward compatibility: */

#define DH_CHECK_P_NOT_STRONG_PRIME	DH_CHECK_P_NOT_SAFE_PRIME



#define DHparams_dup(x) ASN1_dup_of_const(DH,i2d_DHparams,d2i_DHparams,x)

#define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \

		(char *(*)())d2i_DHparams,(fp),(unsigned char **)(x))

#define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \
@@ -165,6 +164,8 @@ struct dh_st 
#define d2i_DHparams_bio(bp,x) ASN1_d2i_bio_of(DH,DH_new,d2i_DHparams,bp,x)

#define i2d_DHparams_bio(bp,x) ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x)



DH *DHparams_dup(DH *);



const DH_METHOD *DH_OpenSSL(void);



void DH_set_default_method(const DH_METHOD *meth);

crypto/dh/dh_asn1.c

+5 −0
Original line number Diff line number Diff line
@@ -86,3 +86,8 @@ ASN1_SEQUENCE_cb(DHparams, dh_cb) = { 
} ASN1_SEQUENCE_END_cb(DH, DHparams)



IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DH, DHparams, DHparams)



DH *DHparams_dup(DH *dh)

	{

	return ASN1_item_dup(ASN1_ITEM_rptr(DHparams), dh);

	}

crypto/dsa/dsa.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ struct dsa_st 
	ENGINE *engine;

	};



#define DSAparams_dup(x) ASN1_dup_of_const(DSA,i2d_DSAparams,d2i_DSAparams,x)

#define d2i_DSAparams_fp(fp,x) (DSA *)ASN1_d2i_fp((char *(*)())DSA_new, \

		(char *(*)())d2i_DSAparams,(fp),(unsigned char **)(x))

#define i2d_DSAparams_fp(fp,x) ASN1_i2d_fp(i2d_DSAparams,(fp), \
@@ -174,6 +173,7 @@ struct dsa_st 
#define i2d_DSAparams_bio(bp,x) ASN1_i2d_bio_of_const(DSA,i2d_DSAparams,bp,x)





DSA *DSAparams_dup(DSA *x);

DSA_SIG * DSA_SIG_new(void);

void	DSA_SIG_free(DSA_SIG *a);

int	i2d_DSA_SIG(const DSA_SIG *a, unsigned char **pp);