systm-h-header-inclusion-20060227

[openafs.git] / src / rxkad / domestic / crypt_conn.c

diff --git a/src/rxkad/domestic/crypt_conn.c b/src/rxkad/domestic/crypt_conn.c
index 7b7ef51..f827e04 100644 (file)
--- a/src/rxkad/domestic/crypt_conn.c
+++ b/src/rxkad/domestic/crypt_conn.c
@@ -18,12 +18,16 @@
 #include <afs/param.h>
 #endif
 
-RCSID("$Header$");
+RCSID
+    ("$Header$");
 
 #ifdef KERNEL
 #include "afs/stds.h"
 #ifndef UKERNEL
 #include "h/types.h"
+#if defined(AFS_AIX_ENV) || defined(AFS_AUX_ENV) || defined(AFS_SUN5_ENV)
+#include "h/systm.h"
+#endif
 #include "rx/rx.h"
 #include "netinet/in.h"
 #else /* !UKERNEL */
@@ -41,78 +45,76 @@ RCSID("$Header$");
 #endif
 #endif /* KERNEL */
 
+#include <des/stats.h>
 #include "private_data.h"
 #define XPRT_RXKAD_CRYPT
 
-afs_int32 rxkad_DecryptPacket (const struct rx_connection *conn, 
-       const fc_KeySchedule *schedule, const fc_InitializationVector *ivec, 
-       const int inlen, struct rx_packet *packet)
+afs_int32
+rxkad_DecryptPacket(const struct rx_connection *conn,
+                   const fc_KeySchedule * schedule,
+                   const fc_InitializationVector * ivec, const int inlen,
+                   struct rx_packet *packet)
 {
     afs_uint32 xor[2];
     struct rx_securityClass *obj;
-    struct rxkad_cprivate *tp;         /* s & c have type at same offset */
-    char * data;
-    int i,tlen,len;
+    struct rxkad_cprivate *tp; /* s & c have type at same offset */
+    char *data;
+    int i, tlen, len;
 
     len = inlen;
 
     obj = rx_SecurityObjectOf(conn);
     tp = (struct rxkad_cprivate *)obj->privateData;
-    LOCK_RXKAD_STATS
-    rxkad_stats.bytesDecrypted[rxkad_TypeIndex(tp->type)] += len;
-    UNLOCK_RXKAD_STATS
-
+    ADD_RXKAD_STATS(bytesDecrypted[rxkad_TypeIndex(tp->type)],len);
     memcpy((void *)xor, (void *)ivec, sizeof(xor));
-    for (i = 0; len ; i++) {
-      data = rx_data(packet, i, tlen);
-      if (!data || !tlen)
-       break;
-      tlen = MIN(len, tlen);
-      fc_cbc_encrypt (data, data, tlen, schedule, xor, DECRYPT);
-      len -= tlen;
+    for (i = 0; len; i++) {
+       data = rx_data(packet, i, tlen);
+       if (!data || !tlen)
+           break;
+       tlen = MIN(len, tlen);
+       fc_cbc_encrypt(data, data, tlen, schedule, xor, DECRYPT);
+       len -= tlen;
     }
     /* Do this if packet checksums are ever enabled (below), but
      * current version just passes zero
-    afs_int32 cksum;
-    cksum = ntohl(rx_GetInt32(packet, 1));
-    */
+     afs_int32 cksum;
+     cksum = ntohl(rx_GetInt32(packet, 1));
+     */
     return 0;
 }
 
-afs_int32 rxkad_EncryptPacket (const struct rx_connection *conn, 
-       const fc_KeySchedule *schedule, const fc_InitializationVector *ivec, 
-       const int inlen, struct rx_packet *packet)
+afs_int32
+rxkad_EncryptPacket(const struct rx_connection * conn,
+                   const fc_KeySchedule * schedule,
+                   const fc_InitializationVector * ivec, const int inlen,
+                   struct rx_packet * packet)
 {
     afs_uint32 xor[2];
     struct rx_securityClass *obj;
-    struct rxkad_cprivate *tp;         /* s & c have type at same offset */
+    struct rxkad_cprivate *tp; /* s & c have type at same offset */
     char *data;
-    int i,tlen,len;
+    int i, tlen, len;
 
     len = inlen;
 
     obj = rx_SecurityObjectOf(conn);
     tp = (struct rxkad_cprivate *)obj->privateData;
-    LOCK_RXKAD_STATS
-    rxkad_stats.bytesEncrypted[rxkad_TypeIndex(tp->type)] += len;
-    UNLOCK_RXKAD_STATS
-
+    ADD_RXKAD_STATS(bytesEncrypted[rxkad_TypeIndex(tp->type)],len);
     /*
-    afs_int32 cksum;
-    cksum = htonl(0);          
-    * Future option to add cksum here, but for now we just put 0
-    */
-    rx_PutInt32(packet, 1*sizeof(afs_int32), 0); 
+     * afs_int32 cksum;
+     * cksum = htonl(0);                
+     * * Future option to add cksum here, but for now we just put 0
+     */
+    rx_PutInt32(packet, 1 * sizeof(afs_int32), 0);
 
     memcpy((void *)xor, (void *)ivec, sizeof(xor));
-    for (i = 0; len ; i++) {
-      data = rx_data(packet, i, tlen);
-      if (!data || !tlen)
-       break;
-      tlen = MIN(len, tlen);
-      fc_cbc_encrypt (data, data, tlen, schedule, xor, ENCRYPT);
-      len -= tlen;
+    for (i = 0; len; i++) {
+       data = rx_data(packet, i, tlen);
+       if (!data || !tlen)
+           break;
+       tlen = MIN(len, tlen);
+       fc_cbc_encrypt(data, data, tlen, schedule, xor, ENCRYPT);
+       len -= tlen;
     }
     return 0;
 }
-