summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/md2/md2_one.c
diff options
context:
space:
mode:
authordjm <>2008-09-06 12:17:54 +0000
committerdjm <>2008-09-06 12:17:54 +0000
commit6b62d1fdd8a4fd35acfcc0c4bb1bf8b757fa8cda (patch)
tree7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libcrypto/md2/md2_one.c
parent89181603212b41e95cde36b1be5a146ce8fb2935 (diff)
downloadopenbsd-6b62d1fdd8a4fd35acfcc0c4bb1bf8b757fa8cda.tar.gz
openbsd-6b62d1fdd8a4fd35acfcc0c4bb1bf8b757fa8cda.tar.bz2
openbsd-6b62d1fdd8a4fd35acfcc0c4bb1bf8b757fa8cda.zip
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/md2/md2_one.c')
-rw-r--r--src/lib/libcrypto/md2/md2_one.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/md2/md2_one.c b/src/lib/libcrypto/md2/md2_one.c
index 8c36ba5779..f7fef5cc0a 100644
--- a/src/lib/libcrypto/md2/md2_one.c
+++ b/src/lib/libcrypto/md2/md2_one.c
@@ -63,7 +63,7 @@
63/* This is a separate file so that #defines in cryptlib.h can 63/* This is a separate file so that #defines in cryptlib.h can
64 * map my MD functions to different names */ 64 * map my MD functions to different names */
65 65
66unsigned char *MD2(const unsigned char *d, unsigned long n, unsigned char *md) 66unsigned char *MD2(const unsigned char *d, size_t n, unsigned char *md)
67 { 67 {
68 MD2_CTX c; 68 MD2_CTX c;
69 static unsigned char m[MD2_DIGEST_LENGTH]; 69 static unsigned char m[MD2_DIGEST_LENGTH];