diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-09-06 15:49:46 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-09-06 15:49:46 +0000 |
| commit | f4274da164c44699f980f5c897bc7f7727233337 (patch) | |
| tree | 958dd498eb89320cbe94d0424c5b865d4009bcd9 /crypto/asn1 | |
| parent | 07a9d1a2c2b735cbc327065000b545deb5e136cf (diff) | |
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.
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/a_dup.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/asn1.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/asn1/a_dup.c b/crypto/asn1/a_dup.c index 199d50f521..d98992548a 100644 --- a/crypto/asn1/a_dup.c +++ b/crypto/asn1/a_dup.c @@ -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; diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index dfc6790ef6..f7718b5a94 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -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), \ |