Commit f4274da1 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 07a9d1a2

apps/privkey.pem

+16 −18
Original line number Diff line number Diff line 
-----BEGIN RSA PRIVATE KEY-----

Proc-Type: 4,ENCRYPTED

DEK-Info: DES-EDE3-CBC,BA26229A1653B7FF



6nhWG8PKhTPO/s3ZvjUa6226NlKdvPDZFsNXOOoSUs9ejxpb/aj5huhs6qRYzsz9

Year47uaAZYhGD0vAagnNiBnYmjWEpN9G/wQxG7pgZThK1ZxDi63qn8aQ8UjuGHo

F6RpnnBQIAnWTWqr/Qsybtc5EoNkrj/Cpx0OfbSr6gZsFBCxwX1R1hT3/mhJ45f3

XMofY32Vdfx9/vtw1O7HmlHXQnXaqnbd9/nn1EpvFJG9+UjPoW7gV4jCOLuR4deE

jS8hm+cpkwXmFtk3VGjT9tQXPpMv3JpYfBqgGQoMAJ5Toq0DWcHi6Wg08PsD8lgy

vmTioPsRg+JGkJkJ8GnusgLpQdlQJbjzd7wGE6ElUFLfOxLo8bLlRHoriHNdWYhh

JjY0LyeTkovcmWxVjImc6ZyBz5Ly4t0BYf1gq3OkjsV91Q1taBxnhiavfizqMCAf

PPB3sLQnlXG77TOXkNxpqbZfEYrVZW2Nsqqdn8s07Uj4IMONZyq2odYKWFPMJBiM

POYwXjMAOcmFMTHYsVlhcUJuV6LOuipw/FEbTtPH/MYMxLe4zx65dYo1rb4iLKLS

gMtB0o/Wl4Xno3ZXh1ucicYnV2J7NpVcjVq+3SFiCRu2SrSkZHZ23EPS13Ec6fcz

8X/YGA2vTJ8MAOozAzQUwHQYvLk7bIoQVekqDq4p0AZQbhdspHpArCk0Ifqqzg/v

Uyky/zZiQYanzDenTSRVI/8wac3olxpU8QvbySxYqmbkgq6bTpXJfYFQfnAttEsC

dA4S5UFgyOPZluxCAM4yaJF3Ft6neutNwftuJQMbgCUi9vYg2tGdSw==

-----END RSA PRIVATE KEY-----
 
-----BEGIN PRIVATE KEY-----

MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMo7DFNMqywUA1O/

qvWqCOm6rGrUAcR+dKsSXw6y2qiKO7APDDyotc0b4Mxwqjga98npex2RBIwUoCGJ

iEmMXo/a8RbXVUZ+ZwcAX7PC+XeXVC5qoajaBBkd2MvYmib/2PqnNrgvhHsUL5dO

xhC7cRqxLM/g45k3Yyw+nGa+WkTdAgMBAAECgYBMBT5w4dVG0I8foGFnz+9hzWab

Ee9IKjE5TcKmB93ilXQyjrWO5+zPmbc7ou6aAKk9IaPCTY1kCyzW7pho7Xdt+RFq

TgVXGZZfqtixO7f2/5oqZAkd00eOn9ZrhBpVMu4yXbbDvhDyFe4/oy0HGDjRUhxa

Lf6ZlBuTherxm4eFkQJBAPBQwRs9UtqaMAQlagA9pV5UsQjV1WT4IxDURMPfXgCd

ETNkB6pP0SmxQm5xhv9N2HY1UtoWpug9s0OU5IJB15sCQQDXbfbjiujNbuOxCFNw

68JZaCFVdNovyOWORkpenQLNEjVkmTCS9OayK09ADEYtsdpUGKeF+2EYBNkFr5px

CajnAkBMYI4PNz1HBuwt1SpMa0tMoMQnV7bbwVV7usskKbC5pzHZUHhzM6z5gEHp

0iEisT4Ty7zKXZqsgzefSgoaMAzzAkEAoCIaUhtwXzwdPfvNYnOs3J6doJMimECB

+lbfcyLM8TimvadtRt+KGEg/OYGmLNM2UiqdY+duzdbUpvhYGcwvYwJAQvaoi9z2

CkiwSs/PFrLaNlfLJmXRsUBzmiWYoh6+IQJJorEXz7ewI72ee9RBO4s746cgUFwH

Ri+qO+HhZFUBqQ==

-----END PRIVATE KEY-----

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);

	}