diff options
| author | Sam Hartman <hartmans@mit.edu> | 2009-01-03 23:19:42 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2009-01-03 23:19:42 +0000 |
| commit | 0ba5ccd7bb3ea15e44a87f84ca6feed8890f657d (patch) | |
| tree | 2049c9c2cb135fe36b14c0a171711259258d18ec /src/lib/crypto/aead.c | |
| parent | ff0a6514c9f4230938c29922d69cbd4e83691adf (diff) | |
| download | krb5-0ba5ccd7bb3ea15e44a87f84ca6feed8890f657d.tar.gz krb5-0ba5ccd7bb3ea15e44a87f84ca6feed8890f657d.tar.xz krb5-0ba5ccd7bb3ea15e44a87f84ca6feed8890f657d.zip | |
Merge mskrb-integ onto trunk
The mskrb-integ branch includes support for the following projects:
Projects/Aliases
* Projects/PAC and principal APIs
* Projects/AEAD encryption API
* Projects/GSSAPI DCE
* Projects/RFC 3244
In addition, it includes support for enctype negotiation, and a variety of GSS-API extensions.
In the KDC it includes support for protocol transition, constrained delegation
and a new authorization data interface.
The old authorization data interface is also supported.
This commit merges the mskrb-integ branch on to the trunk.
Additional review and testing is required.
Merge commit 'mskrb-integ' into trunk
ticket: new
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21690 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/aead.c')
| -rw-r--r-- | src/lib/crypto/aead.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/crypto/aead.c b/src/lib/crypto/aead.c index 53dc65076..2d9a8353a 100644 --- a/src/lib/crypto/aead.c +++ b/src/lib/crypto/aead.c @@ -130,9 +130,9 @@ krb5int_c_make_checksum_iov(const struct krb5_cksumtypes *cksum_type, ret = (*(cksum_type->keyhash->hash_iov))(key, usage, 0, data, num_data, cksum_data); } else if (cksum_type->flags & KRB5_CKSUMFLAG_DERIVE) { - ret = krb5_dk_make_checksum_iov(cksum_type->hash, - key, usage, data, num_data, - cksum_data); + ret = krb5int_dk_make_checksum_iov(cksum_type->hash, + key, usage, data, num_data, + cksum_data); } else { ret = make_unkeyed_checksum_iov(cksum_type->hash, data, num_data, cksum_data); @@ -289,8 +289,7 @@ krb5int_c_iov_get_block(unsigned char *block, memset(block + j, 0, block_size - j); #ifdef DEBUG_IOV - if (iov_state->iov_pos < num_data) - dump_block("get_block", i, j, block, block_size); + dump_block("get_block", i, j, block, block_size); #endif return (iov_state->iov_pos < num_data); @@ -339,8 +338,7 @@ krb5int_c_iov_put_block(const krb5_crypto_iov *data, iov_state->iov_pos = i; #ifdef DEBUG_IOV - if (iov_state->iov_pos < num_data) - dump_block("put_block", i, j, block, block_size); + dump_block("put_block", i, j, block, block_size); #endif return (iov_state->iov_pos < num_data); |