Cleanup

git-svn-id: svn://anonsvn.mit.edu/krb5/users/lhoward/camellia-ccm@24071 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 9 insertions, 10 deletions

diff --git a/src/lib/crypto/krb/checksum/cmac.c b/src/lib/crypto/krb/checksum/cmac.c
index 3b5cde5..bcb6049 100644
--- a/src/lib/crypto/krb/checksum/cmac.c
+++ b/src/lib/crypto/krb/checksum/cmac.c
@@ -141,8 +141,7 @@ padding(unsigned char *lastb, unsigned char *pad, int length)
  * is compatible with RFC 4493.
  */
 krb5_error_code
-krb5int_cmac_checksum(const struct krb5_enc_provider *enc,
-                      krb5_key key, krb5_keyusage usage,
+krb5int_cmac_checksum(const struct krb5_enc_provider *enc, krb5_key key,
                       const krb5_crypto_iov *data, size_t num_data,
                       krb5_data *output)
 {
diff --git a/src/lib/crypto/krb/cksumtypes.h b/src/lib/crypto/krb/cksumtypes.h
index fb586ee..c5eb493 100644
--- a/src/lib/crypto/krb/cksumtypes.h
+++ b/src/lib/crypto/krb/cksumtypes.h
@@ -98,7 +98,7 @@ krb5_error_code krb5int_hmacmd5_checksum(const struct krb5_cksumtypes *ctp,
                                          krb5_data *output);
 
 krb5_error_code krb5int_cmac_checksum(const struct krb5_enc_provider *enc,
-                                      krb5_key key, krb5_keyusage usage,
+                                      krb5_key key,
                                       const krb5_crypto_iov *data,
                                       size_t num_data,
                                       krb5_data *output);
diff --git a/src/lib/crypto/krb/dk/checksum_cmac.c b/src/lib/crypto/krb/dk/checksum_cmac.c
index 9d871ba..41e1232 100644
--- a/src/lib/crypto/krb/dk/checksum_cmac.c
+++ b/src/lib/crypto/krb/dk/checksum_cmac.c
@@ -64,7 +64,7 @@ krb5int_dk_cmac_checksum(const struct krb5_cksumtypes *ctp,
         return ret;
 
     /* Hash the data. */
-    ret = krb5int_cmac_checksum(enc, kc, usage, data, num_data, output);
+    ret = krb5int_cmac_checksum(enc, kc, data, num_data, output);
     if (ret != 0)
         memset(output->data, 0, output->length);
 
diff --git a/src/lib/crypto/krb/dk/derive.c b/src/lib/crypto/krb/dk/derive.c
index 01b109d..f560aa9 100644
--- a/src/lib/crypto/krb/dk/derive.c
+++ b/src/lib/crypto/krb/dk/derive.c
@@ -131,9 +131,9 @@ cleanup:
 }
 
 static krb5_error_code
-derive_random_cmac(const struct krb5_enc_provider *enc,
-                   krb5_key inkey, krb5_data *outrnd,
-                   const krb5_data *in_constant)
+derive_random_sp800_cmac(const struct krb5_enc_provider *enc,
+                         krb5_key inkey, krb5_data *outrnd,
+                         const krb5_data *in_constant)
 {
     size_t blocksize, keybytes, n;
     krb5_crypto_iov iov[4];
@@ -167,7 +167,7 @@ derive_random_cmac(const struct krb5_enc_provider *enc,
     for (i = 1, n = 0; n < keybytes; i++) {
         store_32_be(i, ibuf);
 
-        ret = krb5int_cmac_checksum(enc, inkey, 0, iov, 4, &prf);
+        ret = krb5int_cmac_checksum(enc, inkey, iov, 4, &prf);
         if (ret)
             goto cleanup;
 
@@ -193,7 +193,7 @@ krb5int_derive_random(const struct krb5_enc_provider *enc,
     krb5_error_code ret;
 
     if (enc->cbc_mac)
-        ret = derive_random_cmac(enc, inkey, outrnd, in_constant);
+        ret = derive_random_sp800_cmac(enc, inkey, outrnd, in_constant);
     else
         ret = derive_random_rfc3961(enc, inkey, outrnd, in_constant);
 
diff --git a/src/lib/crypto/krb/prf/ccm_prf.c b/src/lib/crypto/krb/prf/ccm_prf.c
index 17b4dc9..ba23be7 100644
--- a/src/lib/crypto/krb/prf/ccm_prf.c
+++ b/src/lib/crypto/krb/prf/ccm_prf.c
@@ -54,7 +54,7 @@ krb5int_dk_ccm_prf(const struct krb5_keytypes *ktp, krb5_key key,
         goto cleanup;
 
     /* PRF is CMAC of input */
-    ret = krb5int_cmac_checksum(ktp->enc, kp, 0, &iov, 1, out);
+    ret = krb5int_cmac_checksum(ktp->enc, kp, &iov, 1, out);
     if (ret != 0)
         goto cleanup;