diff options
| author | djm <> | 2008-09-06 12:17:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:17:54 +0000 |
| commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
| tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libcrypto/asn1/a_meth.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/asn1/a_meth.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/a_meth.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libcrypto/asn1/a_meth.c b/src/lib/libcrypto/asn1/a_meth.c index 63158e9cab..50bea917e3 100644 --- a/src/lib/libcrypto/asn1/a_meth.c +++ b/src/lib/libcrypto/asn1/a_meth.c | |||
| @@ -62,16 +62,16 @@ | |||
| 62 | #include <openssl/asn1.h> | 62 | #include <openssl/asn1.h> |
| 63 | 63 | ||
| 64 | static ASN1_METHOD ia5string_meth={ | 64 | static ASN1_METHOD ia5string_meth={ |
| 65 | (int (*)()) i2d_ASN1_IA5STRING, | 65 | (I2D_OF(void)) i2d_ASN1_IA5STRING, |
| 66 | (char *(*)()) d2i_ASN1_IA5STRING, | 66 | (D2I_OF(void)) d2i_ASN1_IA5STRING, |
| 67 | (char *(*)()) ASN1_STRING_new, | 67 | (void *(*)(void))ASN1_STRING_new, |
| 68 | (void (*)()) ASN1_STRING_free}; | 68 | (void (*)(void *))ASN1_STRING_free}; |
| 69 | 69 | ||
| 70 | static ASN1_METHOD bit_string_meth={ | 70 | static ASN1_METHOD bit_string_meth={ |
| 71 | (int (*)()) i2d_ASN1_BIT_STRING, | 71 | (I2D_OF(void)) i2d_ASN1_BIT_STRING, |
| 72 | (char *(*)()) d2i_ASN1_BIT_STRING, | 72 | (D2I_OF(void)) d2i_ASN1_BIT_STRING, |
| 73 | (char *(*)()) ASN1_STRING_new, | 73 | (void *(*)(void))ASN1_STRING_new, |
| 74 | (void (*)()) ASN1_STRING_free}; | 74 | (void (*)(void *))ASN1_STRING_free}; |
| 75 | 75 | ||
| 76 | ASN1_METHOD *ASN1_IA5STRING_asn1_meth(void) | 76 | ASN1_METHOD *ASN1_IA5STRING_asn1_meth(void) |
| 77 | { | 77 | { |