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/rsa/rsa_asn1.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/rsa/rsa_asn1.c')
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_asn1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_asn1.c b/src/lib/libcrypto/rsa/rsa_asn1.c index 1455a7e0e4..bbbf26d50e 100644 --- a/src/lib/libcrypto/rsa/rsa_asn1.c +++ b/src/lib/libcrypto/rsa/rsa_asn1.c | |||
| @@ -63,10 +63,10 @@ | |||
| 63 | #include <openssl/asn1t.h> | 63 | #include <openssl/asn1t.h> |
| 64 | 64 | ||
| 65 | static ASN1_METHOD method={ | 65 | static ASN1_METHOD method={ |
| 66 | (int (*)()) i2d_RSAPrivateKey, | 66 | (I2D_OF(void)) i2d_RSAPrivateKey, |
| 67 | (char *(*)())d2i_RSAPrivateKey, | 67 | (D2I_OF(void)) d2i_RSAPrivateKey, |
| 68 | (char *(*)())RSA_new, | 68 | (void *(*)(void)) RSA_new, |
| 69 | (void (*)()) RSA_free}; | 69 | (void (*)(void *)) RSA_free}; |
| 70 | 70 | ||
| 71 | ASN1_METHOD *RSAPrivateKey_asn1_meth(void) | 71 | ASN1_METHOD *RSAPrivateKey_asn1_meth(void) |
| 72 | { | 72 | { |