bsd-md5-20060407

Use kernel md5 on bsd.

diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c
index e38ef7b8561d59acb52bb7d5e61be2e1b4646747..1575d60fc114c11c7ae623ed4a5757907ff97dc7 100644 (file)
--- a/src/afs/afs_util.c
+++ b/src/afs/afs_util.c
@@ -51,6 +51,10 @@ RCSID
 #include <sys/fp_io.h>
 #endif
 
+#if    defined(AFS_XBSD_ENV)
+#include <crypto/md5.h>
+#endif
+
 afs_int32 afs_new_inum = 0;
 
 #ifndef afs_cv2string
@@ -405,7 +409,15 @@ afs_data_pointer_to_int32(const void *p)
     return ip.i32[i32_sub];
 }
 
-#ifdef AFS_LINUX20_ENV
+#if    defined(AFS_XBSD_ENV)
+
+#define afs_md5 MD5Context
+#define AFS_MD5_Init(m) MD5Init((m))
+#define AFS_MD5_Update(m, p, l) MD5Update((m), (void *)(p), (l))
+#define AFS_MD5_Final(r, m) MD5Final((r), (m))
+
+#else
+
 struct afs_md5 {
     unsigned int sz[2];
     afs_int32 counter[4];
@@ -645,6 +657,7 @@ AFS_MD5_Final (void *res, struct afs_md5 *m)
        }
     }
 }
+#endif
 
 afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
 { 
@@ -653,10 +666,10 @@ afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
     struct afs_md5 ct;
     
     if (afs_new_inum) {
-       MD5_Init(&ct);
-       MD5_Update(&ct, &volume, 4);
-       MD5_Update(&ct, &vnode, 4);
-       MD5_Final(digest, &ct);
+       AFS_MD5_Init(&ct);
+       AFS_MD5_Update(&ct, &volume, 4);
+       AFS_MD5_Update(&ct, &vnode, 4);
+       AFS_MD5_Final(digest, &ct);
        memcpy(&ino, digest, sizeof(ino_t));
     } else {
        ino = (volume << 16) + vnode;
@@ -664,9 +677,3 @@ afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
     }
     return ino;
 }
-#else
-afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
-{
-    return (volume << 16) + vnode;
-}
-#endif