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/md5/md5_one.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/md5/md5_one.c')
| -rw-r--r-- | src/lib/libcrypto/md5/md5_one.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/md5/md5_one.c b/src/lib/libcrypto/md5/md5_one.c index 44c6c455d1..43fee89379 100644 --- a/src/lib/libcrypto/md5/md5_one.c +++ b/src/lib/libcrypto/md5/md5_one.c | |||
| @@ -65,7 +65,7 @@ | |||
| 65 | #include <openssl/ebcdic.h> | 65 | #include <openssl/ebcdic.h> |
| 66 | #endif | 66 | #endif |
| 67 | 67 | ||
| 68 | unsigned char *MD5(const unsigned char *d, unsigned long n, unsigned char *md) | 68 | unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md) |
| 69 | { | 69 | { |
| 70 | MD5_CTX c; | 70 | MD5_CTX c; |
| 71 | static unsigned char m[MD5_DIGEST_LENGTH]; | 71 | static unsigned char m[MD5_DIGEST_LENGTH]; |