diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | fe047d8b632246cb2db3234a0a4f32e5c318857b (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/asn1/a_dup.c | |
| parent | 2ea67f4aa254b09ded62e6e14fc893bbe6381579 (diff) | |
| download | openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.gz openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.bz2 openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/asn1/a_dup.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/a_dup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/asn1/a_dup.c b/src/lib/libcrypto/asn1/a_dup.c index 199d50f521..d98992548a 100644 --- a/src/lib/libcrypto/asn1/a_dup.c +++ b/src/lib/libcrypto/asn1/a_dup.c | |||
| @@ -62,7 +62,7 @@ | |||
| 62 | 62 | ||
| 63 | #ifndef NO_OLD_ASN1 | 63 | #ifndef NO_OLD_ASN1 |
| 64 | 64 | ||
| 65 | void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x) | 65 | void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x) |
| 66 | { | 66 | { |
| 67 | unsigned char *b,*p; | 67 | unsigned char *b,*p; |
| 68 | const unsigned char *p2; | 68 | const unsigned char *p2; |