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_digest.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_digest.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/a_digest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/asn1/a_digest.c b/src/lib/libcrypto/asn1/a_digest.c index 7182e9fa5d..d00d9e22b1 100644 --- a/src/lib/libcrypto/asn1/a_digest.c +++ b/src/lib/libcrypto/asn1/a_digest.c | |||
| @@ -72,7 +72,7 @@ | |||
| 72 | 72 | ||
| 73 | #ifndef NO_ASN1_OLD | 73 | #ifndef NO_ASN1_OLD |
| 74 | 74 | ||
| 75 | int ASN1_digest(int (*i2d)(), const EVP_MD *type, char *data, | 75 | int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data, |
| 76 | unsigned char *md, unsigned int *len) | 76 | unsigned char *md, unsigned int *len) |
| 77 | { | 77 | { |
| 78 | int i; | 78 | int i; |