From 02d8acab720f149e5dbcd42edf6881a72f6cabc5 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Mon, 13 Oct 1997 16:05:23 +0000 Subject: [PATCH] Change etype for des3 to des3-cbc-sha1; fix prototype for keytype_to_cksumtype. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3587 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/encrypt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/krb5/encrypt.c b/lib/krb5/encrypt.c index a8489b193..3a5fbf384 100644 --- a/lib/krb5/encrypt.c +++ b/lib/krb5/encrypt.c @@ -334,11 +334,11 @@ static struct key_type { krb5_cksumtype best_cksumtype; const char *name; } km [] = { - { KEYTYPE_NULL, NULL, ETYPE_NULL, + { KEYTYPE_NULL, NULL, ETYPE_NULL, CKSUMTYPE_NONE, "null" }, - { KEYTYPE_DES, DES_random_key, ETYPE_DES_CBC_MD5, + { KEYTYPE_DES, DES_random_key, ETYPE_DES_CBC_MD5, CKSUMTYPE_RSA_MD5_DES, "des" }, - { KEYTYPE_DES3, DES3_random_key,ETYPE_DES3_CBC_MD5, + { KEYTYPE_DES3, DES3_random_key, ETYPE_DES3_CBC_SHA1, CKSUMTYPE_HMAC_SHA1_DES3, "des3" } }; @@ -418,12 +418,12 @@ krb5_keytype_to_etype(krb5_context context, krb5_keytype ktype, krb5_error_code krb5_keytype_to_cksumtype(krb5_context context, krb5_keytype ktype, - krb5_enctype *etype) + krb5_cksumtype *ctype) { struct key_type *k = find_key_type(ktype); if(k == NULL) return KRB5_PROG_KEYTYPE_NOSUPP; - *etype = k->best_cksumtype; + *ctype = k->best_cksumtype; return 0; }