summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorCraig Disselkoen <cdisselk@cs.ucsd.edu>2019-12-06 16:06:30 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-12-06 16:06:30 +0100
commitd927df43e6af72869900b65e826f985b345bb509 (patch)
tree9bfb893c96ebc7df89584b9bb9bf657f6c95b746 /security
parent9811aa2e155a4389898f3cf1a5ffb38e69497bdd (diff)
downloadUXP-d927df43e6af72869900b65e826f985b345bb509.tar
UXP-d927df43e6af72869900b65e826f985b345bb509.tar.gz
UXP-d927df43e6af72869900b65e826f985b345bb509.tar.lz
UXP-d927df43e6af72869900b65e826f985b345bb509.tar.xz
UXP-d927df43e6af72869900b65e826f985b345bb509.zip
[NSS] Bug 1586176 - EncryptUpdate should use maxout not block size.
Diffstat (limited to 'security')
-rw-r--r--security/nss/lib/softoken/pkcs11c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/nss/lib/softoken/pkcs11c.c b/security/nss/lib/softoken/pkcs11c.c
index 327a67d5c..4837961f1 100644
--- a/security/nss/lib/softoken/pkcs11c.c
+++ b/security/nss/lib/softoken/pkcs11c.c
@@ -1285,7 +1285,7 @@ NSC_EncryptUpdate(CK_SESSION_HANDLE hSession,
}
/* encrypt the current padded data */
rv = (*context->update)(context->cipherInfo, pEncryptedPart,
- &padoutlen, context->blockSize, context->padBuf,
+ &padoutlen, maxout, context->padBuf,
context->blockSize);
if (rv != SECSuccess) {
return sftk_MapCryptError(PORT_GetError());