Use hcrypto for kernel md5

[openafs.git] / src / afs / afs_util.c

diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c
index 4610aa2..37484d9 100644 (file)
--- a/src/afs/afs_util.c
+++ b/src/afs/afs_util.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
- * 
+ *
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
@@ -37,7 +37,7 @@
 #include "afs/afs_stats.h"     /* afs statistics */
 
 #ifdef AFS_LINUX20_ENV
-#include "afs/afs_md5.h"       /* For MD5 inodes - Linux only */
+#include "hcrypto/md5.h"
 #endif
 
 #if    defined(AFS_SUN56_ENV)
@@ -59,8 +59,8 @@ afs_int32 afs_new_inum = 0;
 char *
 afs_cv2string(char *ttp, afs_uint32 aval)
 {
-    register char *tp = ttp;
-    register int i;
+    char *tp = ttp;
+    int i;
     int any;
 
     AFS_STATCNT(afs_cv2string);
@@ -171,7 +171,7 @@ char *
 afs_strrchr(char *s, int c)
 {
     char *p = NULL;
-    
+
     do {
        if (*s == c)
            p = (char*) s;
@@ -187,7 +187,7 @@ afs_strdup(char *s)
     int cc;
 
     cc = strlen(s) + 1;
-    n = (char *)afs_osi_Alloc(cc);
+    n = afs_osi_Alloc(cc);
     if (n)
        memcpy(n, s, cc);
 
@@ -198,7 +198,7 @@ void
 print_internet_address(char *preamble, struct srvAddr *sa, char *postamble,
                       int flag)
 {
-    register struct server *aserver = sa->server;
+    struct server *aserver = sa->server;
     char *ptr = "\n";
     afs_uint32 address;
 
@@ -231,13 +231,13 @@ print_internet_address(char *preamble, struct srvAddr *sa, char *postamble,
 void
 afs_CheckLocks(void)
 {
-    register int i;
+    int i;
 
     afs_warn("Looking for locked data structures.\n");
     afs_warn("conn %p, volume %p, user %p, cell %p, server %p\n", &afs_xconn,
             &afs_xvolume, &afs_xuser, &afs_xcell, &afs_xserver);
     {
-       register struct vcache *tvc;
+       struct vcache *tvc;
        AFS_STATCNT(afs_CheckLocks);
 
        for (i = 0; i < VCSIZE; i++) {
@@ -255,7 +255,7 @@ afs_CheckLocks(void)
        }
     }
     {
-       register struct dcache *tdc;
+       struct dcache *tdc;
        for (i = 0; i < afs_cacheFiles; i++) {
            tdc = afs_indexTable[i];
            if (tdc) {
@@ -369,17 +369,18 @@ afs_data_pointer_to_int32(const void *p)
 
 #ifdef AFS_LINUX20_ENV
 
-afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
-{ 
+afs_int32
+afs_calc_inum(afs_int32 volume, afs_int32 vnode)
+{
     afs_int32 ino, vno = vnode;
     char digest[16];
-    struct afs_md5 ct;
-    
+    struct md5 ct;
+
     if (afs_new_inum) {
-       AFS_MD5_Init(&ct);
-       AFS_MD5_Update(&ct, &volume, 4);
-       AFS_MD5_Update(&ct, &vnode, 4);
-       AFS_MD5_Final(digest, &ct);
+       MD5_Init(&ct);
+       MD5_Update(&ct, &volume, 4);
+       MD5_Update(&ct, &vnode, 4);
+       MD5_Final(digest, &ct);
        memcpy(&ino, digest, sizeof(afs_int32));
        ino ^= (ino ^ vno) & 1;
     } else {
@@ -391,7 +392,8 @@ afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
 
 #else
 
-afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
+afs_int32
+afs_calc_inum (afs_int32 volume, afs_int32 vnode)
 {
     return (volume << 16) + vnode;
 }