From bc063ad9fdb59edc9fd9fbe1bc76d44a69acd68a Mon Sep 17 00:00:00 2001 From: John Kohl Date: Wed, 17 Jan 1990 17:28:33 +0000 Subject: [PATCH] change void * to krb5_pointer remove #undef PROTOTYPE git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@109 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/krb5/encryption.h | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h index 7ff4f88ce..ce82a9b07 100644 --- a/src/include/krb5/encryption.h +++ b/src/include/krb5/encryption.h @@ -3,7 +3,7 @@ * $Author$ * $Id$ * - * Copyright 1989 by the Massachusetts Institute of Technology. + * Copyright 1989,1990 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see the file * . @@ -16,12 +16,6 @@ #ifndef __KRB5_ENCRYPTION__ #define __KRB5_ENCRYPTION__ -#ifndef __STDC__ -#define PROTOTYPE(x) () -#else -#define PROTOTYPE(x) x -#endif - typedef struct _krb5_keyblock { krb5_keytype keytype; int length; @@ -39,23 +33,25 @@ typedef struct _krb5_checksum { typedef struct _krb5_encrypt_block { struct _krb5_cryptosystem_entry *crypto_entry; krb5_keyblock *key; - void *priv; /* for private use, e.g. DES + krb5_pointer priv; /* for private use, e.g. DES key schedules */ } krb5_encrypt_block; /* could be used in a table to find an etype and initialize a block */ typedef struct _krb5_cryptosystem_entry { - int (*encrypt_func) PROTOTYPE((void *in, void *out, size_t length, - krb5_encrypt_block *block)); - int (*decrypt_func) PROTOTYPE((void *in, void *out, size_t length, - krb5_encrypt_block *block)); + int (*encrypt_func) PROTOTYPE((krb5_pointer in, krb5_pointer out, + size_t length, + krb5_encrypt_block *block)); + int (*decrypt_func) PROTOTYPE((krb5_pointer in, krb5_pointer out, + size_t length, + krb5_encrypt_block *block)); int (*process_key) PROTOTYPE((krb5_encrypt_block *block, krb5_keyblock *key)); int (*finish_key) PROTOTYPE((krb5_encrypt_block *block)); int (*string_to_key) PROTOTYPE((krb5_keytype keytype, krb5_keyblock *key, char *string, krb5_principal *client)); - int (*random_key) PROTOTYPE((void *sequence)); - void * (*init_random_key) PROTOTYPE((krb5_keyblock *key)); + int (*random_key) PROTOTYPE((krb5_pointer sequence)); + krb5_pointer (*init_random_key) PROTOTYPE((krb5_keyblock *key)); int block_length; int pad_minimum; /* needed for cksum size computation */ int keysize; @@ -65,8 +61,10 @@ typedef struct _krb5_cryptosystem_entry { /* could be used in a table to find a sumtype */ typedef struct _krb5_checksum_entry { - void * (*sum_func) PROTOTYPE ((void *in, void *out, void *seed, - size_t in_length, size_t seed_length)); + krb5_pointer (*sum_func) PROTOTYPE ((krb5_pointer in, krb5_pointer out, + krb5_pointer seed, + size_t in_length, + size_t seed_length)); int checksum_length; /* length of stuff returned by sum_func */ } krb5_checksum_entry; @@ -91,6 +89,4 @@ typedef struct _krb5_checksum_entry { #define ETYPE_IS_LOCAL(etype) (etype & 0x8000) #define CKSUMTYPE_IS_LOCAL(cksumtype) (cksumtype & 0x8000) -#undef PROTOTYPE - #endif /* __KRB5_ENCRYPTION__ */ -- 2.26.2