From 29e13c7b49e47ef64805e7f864c64d6105293607 Mon Sep 17 00:00:00 2001 From: Chris Provenzano Date: Wed, 6 Sep 1995 19:06:38 +0000 Subject: [PATCH] * cryptoconf.c, des_crc.c, des_md5.c raw_des.c s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6711 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/ChangeLog | 4 ++++ src/lib/crypto/cryptoconf.c | 12 ++++++------ src/lib/crypto/des_crc.c | 2 +- src/lib/crypto/des_md5.c | 2 +- src/lib/crypto/raw_des.c | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index 0c117b8e9..55adaf2d5 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,7 @@ +Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) + + * cryptoconf.c, des_crc.c, des_md5.c raw_des.c + s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g Tue Sep 05 22:10:34 1995 Chris Provenzano (proven@mit.edu) diff --git a/src/lib/crypto/cryptoconf.c b/src/lib/crypto/cryptoconf.c index 0efb6d55e..53747efa9 100644 --- a/src/lib/crypto/cryptoconf.c +++ b/src/lib/crypto/cryptoconf.c @@ -101,15 +101,15 @@ "krb5/encryption.h" */ -krb5_cs_table_entry * NEAR krb5_keytype_array[] = { - 0, /* KEYTYPE_NULL */ - DES_CBC_CRC_CSENTRY, /* KEYTYPE_DES_CBC_CRC */ - 0, /* KEYTYPE_DES_CBC_MD4 */ - DES_CBC_MD5_CSENTRY, /* KEYTYPE_DES_CBC_MD5 */ +krb5_cs_table_entry * NEAR krb5_enctype_array[] = { + 0, /* ENCTYPE_NULL */ + DES_CBC_CRC_CSENTRY, /* ENCTYPE_DES_CBC_CRC */ + 0, /* ENCTYPE_DES_CBC_MD4 */ + DES_CBC_MD5_CSENTRY, /* ENCTYPE_DES_CBC_MD5 */ RAW_DES_CBC_CSENTRY, /* ETYPE_RAW_DES_CBC */ }; -int krb5_max_keytype = sizeof(krb5_keytype_array)/sizeof(krb5_keytype_array[0]) - 1; +int krb5_max_enctype = sizeof(krb5_enctype_array)/sizeof(krb5_enctype_array[0]) - 1; krb5_checksum_entry * NEAR krb5_cksumarray[] = { 0, diff --git a/src/lib/crypto/des_crc.c b/src/lib/crypto/des_crc.c index 7ae255962..02dfb34cb 100644 --- a/src/lib/crypto/des_crc.c +++ b/src/lib/crypto/des_crc.c @@ -47,7 +47,7 @@ static krb5_cryptosystem_entry mit_des_crc_cryptosystem_entry = { sizeof(mit_des_cblock), CRC32_CKSUM_LENGTH+sizeof(mit_des_cblock), sizeof(mit_des_cblock), - KEYTYPE_DES_CBC_CRC + ENCTYPE_DES_CBC_CRC }; krb5_cs_table_entry krb5_des_crc_cst_entry = { diff --git a/src/lib/crypto/des_md5.c b/src/lib/crypto/des_md5.c index b4165ca4b..d365c2b6c 100644 --- a/src/lib/crypto/des_md5.c +++ b/src/lib/crypto/des_md5.c @@ -48,7 +48,7 @@ static krb5_cryptosystem_entry mit_des_md5_cryptosystem_entry = { sizeof(mit_des_cblock), RSA_MD5_CKSUM_LENGTH+sizeof(mit_des_cblock), sizeof(mit_des_cblock), - KEYTYPE_DES_CBC_MD5 + ENCTYPE_DES_CBC_MD5 }; krb5_cs_table_entry krb5_des_md5_cst_entry = { diff --git a/src/lib/crypto/raw_des.c b/src/lib/crypto/raw_des.c index 3afe4f2c8..7948ba601 100644 --- a/src/lib/crypto/raw_des.c +++ b/src/lib/crypto/raw_des.c @@ -45,7 +45,7 @@ static krb5_cryptosystem_entry mit_raw_des_cryptosystem_entry = { sizeof(mit_des_cblock), 0, sizeof(mit_des_cblock), - KEYTYPE_DES_CBC_RAW + ENCTYPE_DES_CBC_RAW }; krb5_cs_table_entry krb5_raw_des_cst_entry = { -- 2.26.2