rxkad: Remove DES include from header file

[openafs.git] / src / rxkad / rxkad_prototypes.h

diff --git a/src/rxkad/rxkad_prototypes.h b/src/rxkad/rxkad_prototypes.h
index 0fead04..9fa059f 100644 (file)
--- a/src/rxkad/rxkad_prototypes.h
+++ b/src/rxkad/rxkad_prototypes.h
@@ -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
@@ -14,12 +14,7 @@
 #include "fcrypt.h"
 #include "rx/rx.h"
 
-/* Don't include des.h where it can cause conflict with krb4 headers */
-#if !defined(NO_DES_H_INCLUDE)
-#include <des.h>
-#endif
-
-/* domestic/crypt_conn.c */
+/* crypt_conn.c */
 extern afs_int32 rxkad_DecryptPacket(const struct rx_connection *conn,
                                     const fc_KeySchedule * schedule,
                                     const fc_InitializationVector * ivec,
@@ -30,7 +25,7 @@ extern afs_int32 rxkad_EncryptPacket(const struct rx_connection *conn,
                                     const int len, struct rx_packet *packet);
 
 
-/* domestic/fcrypt.c */
+/* fcrypt.c */
 extern int fc_keysched(struct ktc_encryptionKey *key,
                       fc_KeySchedule schedule);
 extern afs_int32 fc_ecb_encrypt(void * clear, void * cipher,
@@ -55,6 +50,8 @@ extern int rxkad_GetResponse(struct rx_securityClass *aobj,
 extern void rxkad_ResetState(void);
 
 /* rxkad_common.c */
+extern void rxkad_Init(void);
+
 struct rxkad_endpoint;
 extern int rxkad_SetupEndpoint(struct rx_connection *aconnp,
                               struct rxkad_endpoint *aendpointp);
@@ -83,8 +80,6 @@ extern int rxkad_GetStats(struct rx_securityClass *aobj,
 extern rxkad_level rxkad_StringToLevel(char *string);
 extern char *rxkad_LevelToString(rxkad_level level);
 
-extern void rxkad_global_stats_init(void);
-
 /* rxkad_errs.c */
 
 /* rxkad_server.c */
@@ -94,7 +89,7 @@ extern struct rx_securityClass *rxkad_NewServerSecurityObject(rxkad_level
                                                              int (*get_key)
 
 
-                                                              
+
                                                              (void
                                                               *get_key_rock,
                                                               int kvno,
@@ -104,7 +99,7 @@ extern struct rx_securityClass *rxkad_NewServerSecurityObject(rxkad_level
                                                              int (*user_ok)
 
 
-                                                              
+
                                                              (char *name,
                                                               char
                                                               *instance,
@@ -127,7 +122,7 @@ extern afs_int32 rxkad_GetServerInfo(struct rx_connection *aconn,
                                     char *instance, char *cell,
                                     afs_int32 * kvno);
 extern afs_int32 rxkad_SetConfiguration(struct rx_securityClass *aobj,
-                                        struct rx_connection *aconn, 
+                                        struct rx_connection *aconn,
                                         rx_securityConfigVariables atype,
                                         void * avalue, void **aresult);
 
@@ -135,8 +130,8 @@ extern afs_int32 rxkad_SetConfiguration(struct rx_securityClass *aobj,
 extern int tkt_DecodeTicket(char *asecret, afs_int32 ticketLen,
                            struct ktc_encryptionKey *key, char *name,
                            char *inst, char *cell, struct ktc_encryptionKey *sessionKey,
-                           afs_int32 * host, afs_int32 * start,
-                           afs_int32 * end);
+                           afs_int32 * host, afs_uint32 * start,
+                           afs_uint32 * end);
 extern int tkt_MakeTicket(char *ticket, int *ticketLen,
                          struct ktc_encryptionKey *key, char *name,
                          char *inst, char *cell, afs_uint32 start,
@@ -148,26 +143,17 @@ extern afs_int32 ktohl(char flags, afs_int32 l);
 extern afs_uint32 life_to_time(afs_uint32 start, unsigned char life);
 extern unsigned char time_to_life(afs_uint32 start, afs_uint32 end);
 
+/* crc.c */
+extern void _rxkad_crc_init_table(void);
+extern afs_uint32 _rxkad_crc_update(const char *p, size_t len, afs_uint32 res);
+
 /* ticket5.c */
 extern int tkt_DecodeTicket5(char *ticket, afs_int32 ticket_len,
                             int (*get_key) (void *, int,
                                             struct ktc_encryptionKey *),
                             char *get_key_rock, int serv_kvno, char *name,
                             char *inst, char *cell, struct ktc_encryptionKey *session_key,
-                            afs_int32 * host, afs_int32 * start,
-                            afs_int32 * end, afs_int32 disableDotCheck);
-
-#if !defined(NO_DES_H_INCLUDE)
-static_inline unsigned char *
-ktc_to_cblock(struct ktc_encryptionKey *key) {
-    return (unsigned char *)key;
-}
-
-static_inline des_cblock *
-ktc_to_cblockptr(struct ktc_encryptionKey *key) {
-    return (des_cblock *)key;
-}
-#endif
-
+                            afs_int32 * host, afs_uint32 * start,
+                            afs_uint32 * end, afs_int32 disableDotCheck);
 
 #endif