r225@bucket (orig r221): kcr | 2007-12-24 21:03:14 -0500

 /afs/andrew.cmu.edu/usr18/cg2v/zephyr-krb5-lib-20071215.diff

git-svn-id: svn://svn.1ts.org/debian/trunk/zephyr@290 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/h/internal.h b/h/internal.h
index 403e85c965f1c6b27d0788c7e47b48de889301a8..1516138d25d4e375140f2867ac018d9392853e9f 100644 (file)
--- a/h/internal.h
+++ b/h/internal.h
@@ -140,10 +140,12 @@ Code_t Z_InsertZcodeChecksum(krb5_keyblock *keyblock, ZNotice_t *notice,
 #define Z_keydata(keyblock)    ((keyblock)->contents)
 #define Z_keylen(keyblock)     ((keyblock)->length)
 #define Z_credskey(creds)      (&(creds)->keyblock)
+#define Z_enctype(keyblock)    ((keyblock)->enctype)
 #else
 #define Z_keydata(keyblock)    ((keyblock)->keyvalue.data)
 #define Z_keylen(keyblock)     ((keyblock)->keyvalue.length)
 #define Z_credskey(creds)      (&(creds)->session)
+#define Z_enctype(keyblock)    ((keyblock)->keytype)
 #endif
 
 #ifdef HAVE_KRB5_TICKET_ENC_PART2

diff --git a/lib/Zinternal.c b/lib/Zinternal.c
index 4440dfea0640a23e7a47a509cba6d06c5ee33177..169eb6735e46bffcd851ff33729ff9ec38918792 100644 (file)
--- a/lib/Zinternal.c
+++ b/lib/Zinternal.c
@@ -69,14 +69,14 @@ static struct cksum_map_s {
 
   /* source lost in history (an expired internet-draft) */
   { 5 /* des3-cbc-md5 */,             9  /* rsa-md5-des3 */ },
-  { 7 /* des3-cbc-sha1 */,            12 /* hmac-sha1-des3 */ },
+  { 7 /* des3-cbc-sha1 */,            13 /* hmac-sha1-des3 */ },
 
   /* per draft-ietf-krb-wg-crypto-02.txt */
   { 16 /* des3-cbc-sha1-kd */,        12 /* hmac-sha1-des3-kd */ },
 
   /* per draft-raeburn-krb-rijndael-krb-02.txt */
-  { 17 /* aes128-cts-hmac-sha1-96 */, 10 /* hmac-sha1-96-aes128 */ },
-  { 18 /* aes256-cts-hmac-sha1-96 */, 11 /* hmac-sha1-96-aes256 */ },
+  { 17 /* aes128-cts-hmac-sha1-96 */, 15 /* hmac-sha1-96-aes128 */ },
+  { 18 /* aes256-cts-hmac-sha1-96 */, 16 /* hmac-sha1-96-aes256 */ },
 
   /* per draft-brezak-win2k-krb-rc4-hmac-04.txt */
   { 23 /* rc4-hmac */,                -138 /* hmac-md5 */ },
@@ -1425,32 +1425,8 @@ Z_InsertZcodeChecksum(krb5_keyblock *keyblock, ZNotice_t *notice,
 Code_t
 Z_ExtractEncCksum(krb5_keyblock *keyblock, krb5_enctype *enctype, 
                   krb5_cksumtype *cksumtype) {
-#if HAVE_KRB5_CREDS_KEYBLOCK_ENCTYPE
-    *enctype  = keyblock->enctype; 
+    *enctype  = Z_enctype(keyblock); 
     return Z_krb5_lookup_cksumtype(*enctype, cksumtype); 
-#else 
-    unsigned int len; 
-    ENCTYPE *val; 
-    int i = 0; 
-    Code_t result;
- 
-    result = krb5_keytype_to_enctypes(Z_krb5_ctx, keyblock->keytype, 
-                                     &len, &val); 
-    if (result)
-      return result;
-    
-    do { 
-      if (i == len) break;
-      result = Z_krb5_lookup_cksumtype(val[i], cksumtype); 
-      i++;
-    } while (result != 0); 
-    
-    if (result)
-      return result;
-
-    *enctype = val[i-1]; 
-#endif
-    return 0;
 }
 #endif