rxkad-warning-cleanup-20011005

[openafs.git] / src / rxkad / rxkad_common.c

diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c
index 8e00127..361f21c 100644 (file)
--- a/src/rxkad/rxkad_common.c
+++ b/src/rxkad/rxkad_common.c
@@ -9,8 +9,16 @@
 
 /* The rxkad security object.  Routines used by both client and servers. */
 
+#include <afsconfig.h>
 #ifdef KERNEL
 #include "../afs/param.h"
+#else
+#include <afs/param.h>
+#endif
+
+RCSID("$Header$");
+
+#ifdef KERNEL
 #ifndef UKERNEL
 #include "../afs/stds.h"
 #include "../afs/afs_osi.h"
@@ -30,7 +38,6 @@
 #include "../rx/rx.h"
 
 #else /* KERNEL */
-#include <afs/param.h>
 #include <afs/stds.h>
 #include <sys/types.h>
 #include <time.h>
@@ -44,6 +51,13 @@
 #endif
 #include <rx/rx.h>
 #include <rx/xdr.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
 
 #endif /* KERNEL */
 
@@ -52,9 +66,9 @@
 
 char *rxi_Alloc();
 
-#ifndef max
-#define        max(a,b)    ((a) < (b)? (b) : (a))
-#endif /* max */
+#ifndef afs_max
+#define        afs_max(a,b)    ((a) < (b)? (b) : (a))
+#endif /* afs_max */
 
 #ifndef KERNEL
 #define osi_Time() time(0)
@@ -89,11 +103,10 @@ rxkad_DeriveXORInfo(aconnp, aschedule, aivec, aresult)
     afs_uint32 xor[2];
 
     rxkad_SetupEndpoint(aconnp, &tendpoint);
-    bcopy(aivec, (void *)xor, 2*sizeof(afs_int32));
+    memcpy((void *)xor, aivec, 2*sizeof(afs_int32));
     fc_cbc_encrypt(&tendpoint, &tendpoint, sizeof(tendpoint),
                   aschedule, xor, ENCRYPT);
-    bcopy(((char *)&tendpoint) + sizeof(tendpoint) - ENCRYPTIONBLOCKSIZE,
-         aresult, ENCRYPTIONBLOCKSIZE);
+    memcpy(aresult, ((char *)&tendpoint) + sizeof(tendpoint) - ENCRYPTIONBLOCKSIZE, ENCRYPTIONBLOCKSIZE);
     return 0;
 }
 
@@ -208,7 +221,7 @@ rxs_return_t rxkad_NewConnection (aobj, aconn)
     if (rx_IsServerConn(aconn)) {
        int size = sizeof(struct rxkad_sconn);
        aconn->securityData = (char *) rxi_Alloc (size);
-       bzero(aconn->securityData, size); /* initialize it conveniently */
+       memset(aconn->securityData, 0, size); /* initialize it conveniently */
     }
     else { /* client */
        struct rxkad_cprivate *tcp;
@@ -216,7 +229,7 @@ rxs_return_t rxkad_NewConnection (aobj, aconn)
        int size = sizeof(struct rxkad_cconn);
        tccp = (struct rxkad_cconn *) rxi_Alloc (size);
        aconn->securityData = (char *) tccp;
-       bzero(aconn->securityData, size); /* initialize it conveniently */
+       memset(aconn->securityData, 0, size); /* initialize it conveniently */
        tcp = (struct rxkad_cprivate *) aobj->privateData;
        if (!(tcp->type & rxkad_client)) return RXKADINCONSISTENCY;
        rxkad_SetLevel(aconn, tcp->level); /* set header and trailer sizes */
@@ -446,7 +459,7 @@ rxs_return_t rxkad_PreparePacket (aobj, acall, apacket)
     switch (level) {
       case rxkad_clear: return 0;      /* shouldn't happen */
       case rxkad_auth:
-       nlen = max (ENCRYPTIONBLOCKSIZE,
+       nlen = afs_max (ENCRYPTIONBLOCKSIZE,
                    len + rx_GetSecurityHeaderSize(tconn));
        if (nlen > (len + rx_GetSecurityHeaderSize(tconn))) {
          rxi_RoundUpPacket(apacket, nlen - (len + rx_GetSecurityHeaderSize(tconn)));