Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

construct salt and password buffers for PBE correctly

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@107778 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ian.mcgreer%sun.com
2001-11-09 22:51:42 +00:00
parent c41f9aa079
commit a508954d9b
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/security/nss/lib/softoken/lowpbe.c
View File

@@ -470,15 +470,19 @@ nsspkcs5_PKCS12PBE(const SECHashObject *hashObject,
PORT_Memset(D.data, (char)bitGenPurpose, D.len);
if (SLen) {
PORT_Memcpy(S, salt->data, salt->len);
if (salt->len != SLen) {
PORT_Memcpy(S+salt->len, salt->data, SLen-(salt->len));
unsigned int z = 0;
while (z < SLen) {
int amount = (z + salt->len > SLen) ? SLen - z : salt->len;
PORT_Memcpy(S, salt->data, amount);
z += salt->len;
}
}
if (PLen) {
PORT_Memcpy(P, salt->data, salt->len);
if (salt->len != PLen) {
PORT_Memcpy(P+salt->len, salt->data, PLen-salt->len);
unsigned int z = 0;
while (z < PLen) {
int amount = (z + pwitem->len > PLen) ? PLen - z : pwitem->len;
PORT_Memcpy(P, pwitem->data, amount);
z += pwitem->len;
}
}