From c2702b2037a7c92ecf220b146d461e653364ecf0 Mon Sep 17 00:00:00 2001 From: John Kohl Date: Wed, 17 Jan 1990 10:48:44 +0000 Subject: [PATCH] change names of types to prefix with krb5_ git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@95 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/krb5/crc-32.h | 2 +- src/include/krb5/encryption.h | 4 ++-- src/include/krb5/mit-des.h | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/include/krb5/crc-32.h b/src/include/krb5/crc-32.h index b626af473..ac4a487a7 100644 --- a/src/include/krb5/crc-32.h +++ b/src/include/krb5/crc-32.h @@ -18,6 +18,6 @@ #define CRC32_CKSUMTYPE 1 -#define CRC32_CKSUM_LENGTH (4*sizeof(octet)) +#define CRC32_CKSUM_LENGTH (4*sizeof(krb5_octet)) #endif /* __KRB5_CRC32__ */ diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h index 03ae1b883..7ff4f88ce 100644 --- a/src/include/krb5/encryption.h +++ b/src/include/krb5/encryption.h @@ -25,14 +25,14 @@ typedef struct _krb5_keyblock { krb5_keytype keytype; int length; - octet contents[1]; /* actually can be more, depending + krb5_octet contents[1]; /* actually can be more, depending on length */ } krb5_keyblock; typedef struct _krb5_checksum { krb5_cksumtype checksum_type; /* checksum type */ int length; - octet contents[1]; /* actually can be more, depending + krb5_octet contents[1]; /* actually can be more, depending on length */ } krb5_checksum; diff --git a/src/include/krb5/mit-des.h b/src/include/krb5/mit-des.h index 4019a9988..5fb70df50 100644 --- a/src/include/krb5/mit-des.h +++ b/src/include/krb5/mit-des.h @@ -16,7 +16,7 @@ #ifndef __KRB5_MIT_DES__ #define __KRB5_MIT_DES__ -typedef octet des_cblock[8]; /* crypto-block size */ +typedef krb5_krb5_octet des_cblock[8]; /* crypto-block size */ /* Key schedule--used internally by DES routines to gain some speed */ typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16]; @@ -25,13 +25,13 @@ typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16]; #define DES_DECRYPT 0 /* the first byte of the key is already in the keyblock */ -#define DES_KEYBLOCK_SZ (sizeof(krb5_keyblock)+sizeof(des_cblock)-sizeof(octet)) +#define DES_KEYBLOCK_SZ (sizeof(krb5_keyblock)+sizeof(des_cblock)-sizeof(krb5_octet)) -#define DES_BLOCK_LENGTH (8*sizeof(octet)) +#define DES_BLOCK_LENGTH (8*sizeof(krb5_octet)) #define DES_CBC_CRC_PAD_MINIMUM CRC32_CKSUM_LENGTH -#define DES_KEYSIZE (8*sizeof(octet)) +#define DES_KEYSIZE (8*sizeof(krb5_octet)) -#define DES_CBC_CKSUM_LENGTH (4*sizeof(octet)) /* XXX ? */ +#define DES_CBC_CKSUM_LENGTH (4*sizeof(krb5_octet)) /* XXX ? */ /* cryptosystem entry descriptor for MIT's DES encryption library */ extern krb5_cryptosystem_entry mit_des_cryptosystem_entry; -- 2.26.2