Skip to content

Commit

Permalink
Remove the ivec parameters from the keyhash provider functions, as
Browse files Browse the repository at this point in the history 
they are never used by callers.


git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23452 dc483132-0cff-0310-8789-dd5450dbe970
  • Loading branch information
ghudson committed Dec 6, 2009
1 parent bdc0ecf commit 303a4a9
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 35 deletions.
9 changes: 3 additions & 6 deletions src/include/k5-int.h
View file
Expand Up @@ -675,20 +675,17 @@ struct krb5_keyhash_provider {
size_t hashsize;

krb5_error_code (*hash)(krb5_key key, krb5_keyusage keyusage,
const krb5_data *ivec, const krb5_data *input,
krb5_data *output);
const krb5_data *input, krb5_data *output);

krb5_error_code (*verify)(krb5_key key, krb5_keyusage keyusage,
const krb5_data *ivec, const krb5_data *input,
const krb5_data *hash, krb5_boolean *valid);
const krb5_data *input, const krb5_data *hash,
krb5_boolean *valid);

krb5_error_code (*hash_iov)(krb5_key key, krb5_keyusage keyusage,
const krb5_data *ivec,
const krb5_crypto_iov *data, size_t num_data,
krb5_data *output);

krb5_error_code (*verify_iov)(krb5_key key, krb5_keyusage keyusage,
const krb5_data *ivec,
const krb5_crypto_iov *data,
size_t num_data, const krb5_data *hash,
krb5_boolean *valid);
Expand Down
8 changes: 4 additions & 4 deletions src/lib/crypto/crypto_tests/t_cksum.c
View file
Expand Up @@ -127,13 +127,13 @@ main(argc, argv)
plaintext.length = strlen(argv[msgindex]);
plaintext.data = argv[msgindex];

if ((kret = (*(khp.hash))(key, 0, 0, &plaintext, &newstyle_checksum))) {
if ((kret = (*(khp.hash))(key, 0, &plaintext, &newstyle_checksum))) {
printf("krb5_calculate_checksum choked with %d\n", kret);
break;
}
print_checksum("correct", MD, argv[msgindex], &newstyle_checksum);

if ((kret = (*(khp.verify))(key, 0, 0, &plaintext, &newstyle_checksum,
if ((kret = (*(khp.verify))(key, 0, &plaintext, &newstyle_checksum,
&valid))) {
printf("verify on new checksum choked with %d\n", kret);
break;
Expand All @@ -146,7 +146,7 @@ main(argc, argv)
printf("Verify succeeded for \"%s\"\n", argv[msgindex]);

newstyle_checksum.data[0]++;
if ((kret = (*(khp.verify))(key, 0, 0, &plaintext, &newstyle_checksum,
if ((kret = (*(khp.verify))(key, 0, &plaintext, &newstyle_checksum,
&valid))) {
printf("verify on new checksum choked with %d\n", kret);
break;
Expand All @@ -163,7 +163,7 @@ main(argc, argv)
kret = 1;
break;
}
if ((kret = (*(khp.verify))(key, 0, 0, &plaintext, &knowncksum_dat,
if ((kret = (*(khp.verify))(key, 0, &plaintext, &knowncksum_dat,
&valid))) {
printf("verify on known checksum choked with %d\n", kret);
break;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/crypto/krb/aead.c
View file
Expand Up @@ -79,7 +79,7 @@ krb5int_c_make_checksum_iov(const struct krb5_cksumtypes *cksum_type,
if (cksum_type->keyhash->hash_iov == NULL)
return KRB5_BAD_ENCTYPE;

ret = cksum_type->keyhash->hash_iov(key, usage, 0, data, num_data,
ret = cksum_type->keyhash->hash_iov(key, usage, data, num_data,
cksum_data);
} else if (cksum_type->flags & KRB5_CKSUMFLAG_DERIVE) {
ret = krb5int_dk_make_checksum(cksum_type->hash, key, usage, data,
Expand Down
7 changes: 2 additions & 5 deletions src/lib/crypto/krb/keyhash_provider/descbc.c
View file
Expand Up @@ -30,17 +30,15 @@
#include "keyhash_provider.h"

static krb5_error_code
k5_descbc_hash(krb5_key key, krb5_keyusage usage, const krb5_data *ivec,
const krb5_data *input, krb5_data *output)
k5_descbc_hash(krb5_key key, krb5_keyusage usage, const krb5_data *input,
krb5_data *output)
{
mit_des_key_schedule schedule;

if (key->keyblock.length != 8)
return(KRB5_BAD_KEYSIZE);
if ((input->length%8) != 0)
return(KRB5_BAD_MSIZE);
if (ivec && (ivec->length != 8))
return(KRB5_CRYPTO_INTERNAL);
if (output->length != 8)
return(KRB5_CRYPTO_INTERNAL);

Expand All @@ -56,7 +54,6 @@ k5_descbc_hash(krb5_key key, krb5_keyusage usage, const krb5_data *ivec,
mit_des_cbc_cksum((unsigned char *) input->data,
(unsigned char *) output->data, input->length,
schedule,
ivec? (const unsigned char *)ivec->data:
(const unsigned char *)mit_des_zeroblock);

memset(schedule, 0, sizeof(schedule));
Expand Down
6 changes: 3 additions & 3 deletions src/lib/crypto/krb/keyhash_provider/hmac_md5.c
View file
Expand Up @@ -37,8 +37,8 @@
#include "../aead.h"

static krb5_error_code
k5_hmac_md5_hash(krb5_key key, krb5_keyusage usage, const krb5_data *iv,
const krb5_data *input, krb5_data *output)
k5_hmac_md5_hash(krb5_key key, krb5_keyusage usage, const krb5_data *input,
krb5_data *output)
{
krb5_keyusage ms_usage;
krb5_error_code ret;
Expand Down Expand Up @@ -80,7 +80,7 @@ k5_hmac_md5_hash(krb5_key key, krb5_keyusage usage, const krb5_data *iv,
}

static krb5_error_code
k5_hmac_md5_hash_iov(krb5_key key, krb5_keyusage usage, const krb5_data *iv,
k5_hmac_md5_hash_iov(krb5_key key, krb5_keyusage usage,
const krb5_crypto_iov *data, size_t num_data,
krb5_data *output)
{
Expand Down
5 changes: 2 additions & 3 deletions src/lib/crypto/krb/keyhash_provider/k5_md4des.c
View file
Expand Up @@ -64,8 +64,8 @@ mk_xorkey(krb5_key origkey, krb5_key *xorkey)
}

static krb5_error_code
k5_md4des_hash(krb5_key key, krb5_keyusage usage, const krb5_data *ivec,
const krb5_data *input, krb5_data *output)
k5_md4des_hash(krb5_key key, krb5_keyusage usage, const krb5_data *input,
krb5_data *output)
{
krb5_error_code ret;
krb5_data data;
Expand Down Expand Up @@ -113,7 +113,6 @@ k5_md4des_hash(krb5_key key, krb5_keyusage usage, const krb5_data *ivec,

static krb5_error_code
k5_md4des_verify(krb5_key key, krb5_keyusage usage,
const krb5_data *ivec,
const krb5_data *input, const krb5_data *hash,
krb5_boolean *valid)
{
Expand Down
9 changes: 4 additions & 5 deletions src/lib/crypto/krb/keyhash_provider/k5_md5des.c
View file
Expand Up @@ -64,8 +64,8 @@ mk_xorkey(krb5_key origkey, krb5_key *xorkey)
}

static krb5_error_code
k5_md5des_hash(krb5_key key, krb5_keyusage usage, const krb5_data *ivec,
const krb5_data *input, krb5_data *output)
k5_md5des_hash(krb5_key key, krb5_keyusage usage, const krb5_data *input,
krb5_data *output)
{
krb5_error_code ret;
krb5_data data;
Expand Down Expand Up @@ -113,9 +113,8 @@ k5_md5des_hash(krb5_key key, krb5_keyusage usage, const krb5_data *ivec,
}

static krb5_error_code
k5_md5des_verify(krb5_key key, krb5_keyusage usage, const krb5_data *ivec,
const krb5_data *input, const krb5_data *hash,
krb5_boolean *valid)
k5_md5des_verify(krb5_key key, krb5_keyusage usage, const krb5_data *input,
const krb5_data *hash, krb5_boolean *valid)
{
krb5_error_code ret;
krb5_MD5_CTX ctx;
Expand Down
4 changes: 2 additions & 2 deletions src/lib/crypto/krb/keyhash_provider/md5_hmac.c
View file
Expand Up @@ -34,8 +34,8 @@
#include "hash_provider.h"

static krb5_error_code
k5_md5_hmac_hash(krb5_key key, krb5_keyusage usage, const krb5_data *iv,
const krb5_data *input, krb5_data *output)
k5_md5_hmac_hash(krb5_key key, krb5_keyusage usage, const krb5_data *input,
krb5_data *output)
{
krb5_keyusage ms_usage;
krb5_MD5_CTX ctx;
Expand Down
4 changes: 2 additions & 2 deletions src/lib/crypto/krb/make_checksum.c
View file
Expand Up @@ -82,9 +82,9 @@ krb5_k_make_checksum(krb5_context context, krb5_cksumtype cksumtype,
keyhash = ctp->keyhash;
if (keyhash->hash == NULL) {
assert(keyhash->hash_iov != NULL);
ret = (*keyhash->hash_iov)(key, usage, 0, &iov, 1, &data);
ret = (*keyhash->hash_iov)(key, usage, &iov, 1, &data);
} else {
ret = (*keyhash->hash)(key, usage, 0, input, &data);
ret = (*keyhash->hash)(key, usage, input, &data);
}
} else if (ctp->flags & KRB5_CKSUMFLAG_DERIVE) {
ret = krb5int_dk_make_checksum(ctp->hash, key, usage, &iov, 1, &data);
Expand Down
5 changes: 2 additions & 3 deletions src/lib/crypto/krb/verify_checksum.c
View file
Expand Up @@ -63,10 +63,9 @@ krb5_k_verify_checksum(krb5_context context, krb5_key key,
iov[0].data.data = data->data;
iov[0].data.length = data->length;

return (*keyhash->verify_iov)(key, usage, 0, iov, 1, &indata,
valid);
return (*keyhash->verify_iov)(key, usage, iov, 1, &indata, valid);
} else if (keyhash->verify != NULL) {
return (*keyhash->verify)(key, usage, 0, data, &indata, valid);
return (*keyhash->verify)(key, usage, data, &indata, valid);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib/crypto/krb/verify_checksum_iov.c
View file
Expand Up @@ -60,7 +60,7 @@ krb5_k_verify_checksum_iov(krb5_context context,

/* If there's actually a verify function, call it. */
if (ctp->keyhash && ctp->keyhash->verify_iov) {
return (*ctp->keyhash->verify_iov)(key, usage, 0, data, num_data,
return (*ctp->keyhash->verify_iov)(key, usage, data, num_data,
&checksum->data, valid);
}

Expand Down

0 comments on commit 303a4a9

Please sign in to comment.