diff options
author | Greg Hudson <ghudson@mit.edu> | 2015-12-07 12:16:41 -0500 |
---|---|---|
committer | Tom Yu <tlyu@mit.edu> | 2015-12-18 13:31:24 -0500 |
commit | 52af376a74eac32ead13f8e1dd87d2c8fa28a648 (patch) | |
tree | d0a731d99e775657831a601ef9a1ef51d0777ac6 | |
parent | 727569cd87e89f46179b5010f7bd6bb83f3c0b79 (diff) | |
download | krb5-52af376a74eac32ead13f8e1dd87d2c8fa28a648.zip krb5-52af376a74eac32ead13f8e1dd87d2c8fa28a648.tar.gz krb5-52af376a74eac32ead13f8e1dd87d2c8fa28a648.tar.bz2 |
Fix k5crypto NSS iov processing bug
In k5_nss_gen_stream_iov(), don't stop processing the iov array if we
run across a zero-length iov.
(cherry picked from commit 08fafff29a11e61036021196aaae8c303d1a5662)
ticket: 8300
version_fixed: 1.13.4
tags: -pullup
status: resolved
-rw-r--r-- | src/lib/crypto/nss/enc_provider/enc_gen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/crypto/nss/enc_provider/enc_gen.c b/src/lib/crypto/nss/enc_provider/enc_gen.c index 7022a78..cfe0d65 100644 --- a/src/lib/crypto/nss/enc_provider/enc_gen.c +++ b/src/lib/crypto/nss/enc_provider/enc_gen.c @@ -307,7 +307,7 @@ k5_nss_gen_stream_iov(krb5_key krb_key, krb5_data *state, int return_length; iov = &data[i]; if (iov->data.length <= 0) - break; + continue; if (ENCRYPT_IOV(iov)) { rv = PK11_CipherOp(ctx, (unsigned char *)iov->data.data, |