diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-02-13 23:38:57 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-02-13 23:38:57 +0000 |
| commit | 0f240326537d6d303c288506840189d3b35c4da3 (patch) | |
| tree | 18d2cc5040423c08238569f5346acbdc13941743 /src/lib/crypto/dk/dk_encrypt.c | |
| parent | d761253055c2710df9c351b03b03129fc95ed9f5 (diff) | |
| download | krb5-0f240326537d6d303c288506840189d3b35c4da3.tar.gz krb5-0f240326537d6d303c288506840189d3b35c4da3.tar.xz krb5-0f240326537d6d303c288506840189d3b35c4da3.zip | |
* dk_decrypt.c (krb5_dk_decrypt_maybe_trunc_hmac): New argument IVEC_MODE. If
clear, same old behavior. If set, copy out next to last block for CTS.
(krb5_dk_decrypt, krb5int_aes_dk_decrypt): Pass extra argument.
* dk_encrypt.c (krb5int_aes_dk_encrypt): For IV, copy out next to last block for
CTS.
ticket: 2229
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16077 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/dk/dk_encrypt.c')
| -rw-r--r-- | src/lib/crypto/dk/dk_encrypt.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/lib/crypto/dk/dk_encrypt.c b/src/lib/crypto/dk/dk_encrypt.c index 32cc509af..cf6b826a4 100644 --- a/src/lib/crypto/dk/dk_encrypt.c +++ b/src/lib/crypto/dk/dk_encrypt.c @@ -313,9 +313,10 @@ krb5int_aes_dk_encrypt(enc, hash, key, usage, ivec, input, output) if ((ret = ((*(enc->encrypt))(&ke, ivec, &d1, &d2)))) goto cleanup; - if (ivec != NULL && ivec->length == blocksize) - cn = d2.data + d2.length - blocksize; - else + if (ivec != NULL && ivec->length == blocksize) { + int nblocks = (d2.length + blocksize - 1) / blocksize; + cn = d2.data + blocksize * (nblocks - 2); + } else cn = NULL; /* hash the plaintext */ @@ -333,8 +334,27 @@ krb5int_aes_dk_encrypt(enc, hash, key, usage, ivec, input, output) output->length = enclen; /* update ivec */ - if (cn != NULL) + if (cn != NULL) { memcpy(ivec->data, cn, blocksize); +#if 0 + { + int i; + printf("\n%s: output:", __func__); + for (i = 0; i < output->length; i++) { + if (i % 16 == 0) + printf("\n%s: ", __func__); + printf(" %02x", i[(unsigned char *)output->data]); + } + printf("\n%s: outputIV:", __func__); + for (i = 0; i < ivec->length; i++) { + if (i % 16 == 0) + printf("\n%s: ", __func__); + printf(" %02x", i[(unsigned char *)ivec->data]); + } + printf("\n"); fflush(stdout); + } +#endif + } /* ret is set correctly by the prior call */ |