pull-prototypes-to-head-20020821

[openafs.git] / src / des / des.c

diff --git a/src/des/des.c b/src/des/des.c
index 491bba8..20f79f1 100644 (file)
--- a/src/des/des.c
+++ b/src/des/des.c
@@ -38,7 +38,9 @@
 
 RCSID("$Header$");
 
+#ifndef KERNEL
 #include <stdio.h>
+#endif
 #ifdef AFS_PTHREAD_ENV
 #include <pthread.h>
 #endif /* AFS_PTHREAD_ENV */
@@ -50,6 +52,8 @@ RCSID("$Header$");
 #endif
 #include "stats.h"
 
+#include "des_prototypes.h"
+
 #define XPRT_DES
 
 #ifdef DEBUG
@@ -60,23 +64,15 @@ RCSID("$Header$");
 #define DBG_PRINT(s)
 #endif
 
-extern int des_debug;
-extern int des_cblock_print_file ();
-extern int des_debug_print ();
-extern int swap_long_bytes_bit_number(int);
-
 #ifdef AFS_PTHREAD_ENV
 pthread_mutex_t rxkad_stats_mutex;
 #endif /* AFS_PTHREAD_ENV */
     
-afs_int32
-des_ecb_encrypt(clear, cipher, schedule, encrypt)
-    afs_uint32 *clear;
-    afs_uint32 *cipher;
-    int encrypt;               /* 0 ==> decrypt, else encrypt */
-    register des_key_schedule schedule; /* r11 */
-{
+/* encrypt == 0  ==> decrypt, else encrypt */
 
+afs_int32 des_ecb_encrypt(afs_uint32 *clear, afs_uint32 *cipher, 
+       register des_key_schedule schedule, int encrypt)
+{
     /* better pass 8 bytes, length not checked here */
 
     register afs_uint32 R1, L1; /* R1 = r10, L1 = r9 */