aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Howard <lukeh@padl.com>2010-05-23 18:43:52 +0000
committerLuke Howard <lukeh@padl.com>2010-05-23 18:43:52 +0000
commita67a7aaecc2e55be618db7ae0ce76893d99d50e6 (patch)
treeb0c1778a6f31638aec07c436036b3ba50726418a
parent27e0a6a06fe8cca9cb319ec662d884b7e7b6fba5 (diff)
downloadkrb5-a67a7aaecc2e55be618db7ae0ce76893d99d50e6.zip
krb5-a67a7aaecc2e55be618db7ae0ce76893d99d50e6.tar.gz
krb5-a67a7aaecc2e55be618db7ae0ce76893d99d50e6.tar.bz2
don't zero out last block
git-svn-id: svn://anonsvn.mit.edu/krb5/users/lhoward/camellia-ccm@24093 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/crypto/krb/aead.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/crypto/krb/aead.h b/src/lib/crypto/krb/aead.h
index 0be7771..3239cf4 100644
--- a/src/lib/crypto/krb/aead.h
+++ b/src/lib/crypto/krb/aead.h
@@ -205,11 +205,10 @@ krb5int_c_iov_get_block_nocopy(unsigned char *storage,
iov_state->iov_pos = i;
- if (j != block_size)
- memset(storage + j, 0, block_size - j);
-
if (j == 0)
return FALSE;
+ else if (j != block_size)
+ memset(storage + j, 0, block_size - j);
#ifdef DEBUG_IOV
dump_block("get_block", i, j, (p && *p) ? *p : storage, block_size);