svn rev #24227: branches/camellia-ccm/src/lib/crypto/krb/dk/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24227
Commit By: ghudson
Log Message:
Remove krb5int_camellia_crypto_length; it's no longer needed without
the camellia-cts enctypes.



Changed Files:
U   branches/camellia-ccm/src/lib/crypto/krb/dk/dk.h
U   branches/camellia-ccm/src/lib/crypto/krb/dk/dk_aead.c
Modified: branches/camellia-ccm/src/lib/crypto/krb/dk/dk.h
===================================================================
--- branches/camellia-ccm/src/lib/crypto/krb/dk/dk.h	2010-08-03 09:11:45 UTC (rev 24226)
+++ branches/camellia-ccm/src/lib/crypto/krb/dk/dk.h	2010-08-03 09:25:02 UTC (rev 24227)
@@ -37,10 +37,6 @@
 krb5int_aes_crypto_length(const struct krb5_keytypes *ktp,
                           krb5_cryptotype type);
 
-unsigned int
-krb5int_camellia_crypto_length(const struct krb5_keytypes *ktp,
-                               krb5_cryptotype type);
-
 krb5_error_code
 krb5int_dk_encrypt(const struct krb5_keytypes *ktp, krb5_key key,
                    krb5_keyusage usage, const krb5_data *ivec,

Modified: branches/camellia-ccm/src/lib/crypto/krb/dk/dk_aead.c
===================================================================
--- branches/camellia-ccm/src/lib/crypto/krb/dk/dk_aead.c	2010-08-03 09:11:45 UTC (rev 24226)
+++ branches/camellia-ccm/src/lib/crypto/krb/dk/dk_aead.c	2010-08-03 09:25:02 UTC (rev 24227)
@@ -68,24 +68,6 @@
     }
 }
 
-unsigned int
-krb5int_camellia_crypto_length(const struct krb5_keytypes *ktp,
-                               krb5_cryptotype type)
-{
-    switch (type) {
-    case KRB5_CRYPTO_TYPE_HEADER:
-        return ktp->enc->block_size;
-    case KRB5_CRYPTO_TYPE_PADDING:
-        return 0;
-    case KRB5_CRYPTO_TYPE_TRAILER:
-    case KRB5_CRYPTO_TYPE_CHECKSUM:
-        return 96 / 8;
-    default:
-        assert(0 && "invalid cryptotype passed to krb5int_camellia_crypto_length");
-        return 0;
-    }
-}
-
 krb5_error_code
 krb5int_dk_encrypt(const struct krb5_keytypes *ktp, krb5_key key,
                    krb5_keyusage usage, const krb5_data *ivec,