summaryrefslogtreecommitdiff
path: root/lib/pkcs7
diff options
context:
space:
mode:
authorMichelangelo De Simone <mdesimone@mozilla.com>2016-02-18 17:06:19 -0800
committerMichelangelo De Simone <mdesimone@mozilla.com>2016-02-18 17:06:19 -0800
commit51d6f5a16b293fec24e44c9d6f6586c1b16ac97a (patch)
tree1463dbc3f997110ab5c933933fdb292dcc94653a /lib/pkcs7
parent01ca98dec8433fde67340dd61294132ce8b7bed7 (diff)
downloadnss-hg-51d6f5a16b293fec24e44c9d6f6586c1b16ac97a.tar.gz
Bug 1234510 - Fix for mod0 in sec_PKCS7Encrypt, r=franziskus
Diffstat (limited to 'lib/pkcs7')
-rw-r--r--lib/pkcs7/p7local.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pkcs7/p7local.c b/lib/pkcs7/p7local.c
index 5e67a0eba..4d99384fc 100644
--- a/lib/pkcs7/p7local.c
+++ b/lib/pkcs7/p7local.c
@@ -711,7 +711,7 @@ sec_PKCS7Encrypt (sec_PKCS7CipherObject *obj, unsigned char *output,
}
if (final) {
- padlen = padsize - (pcount % padsize);
+ padlen = padsize ? padsize - (pcount % padsize) : 0;
PORT_Memset (pbuf + pcount, padlen, padlen);
rv = (* obj->doit) (obj->cx, output, &ofraglen, max_output_len,
pbuf, pcount+padlen);