[29218] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.13]: Fix k5crypto NSS iov processing bug
daemon@ATHENA.MIT.EDU (Tom Yu)
Fri Dec 18 13:40:24 2015
Date: Fri, 18 Dec 2015 13:40:20 -0500
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201512181840.tBIIeKRD024219@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/52af376a74eac32ead13f8e1dd87d2c8fa28a648
commit 52af376a74eac32ead13f8e1dd87d2c8fa28a648
Author: Greg Hudson <ghudson@mit.edu>
Date: Mon Dec 7 12:16:41 2015 -0500
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
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,
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
