Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use variables as structure initializers. Bug 274512. Fix build

Browse Source 
on HPUX.  r=julien.pierre,wtchang
This commit is contained in:
nelsonb%netscape.com 2006-01-22 06:42:14 +00:00
parent 06c2abf1fa
commit 944db2b329
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
security/nss/lib/softoken/pkcs11c.c
View File

@ -4696,8 +4696,13 @@ CK_RV NSC_DeriveKey( CK_SESSION_HANDLE hSession,
SECStatus status;
SECItem crsr = { siBuffer, crsrdata, sizeof crsrdata };
SECItem master = { siBuffer, key_block, SSL3_MASTER_SECRET_LENGTH};
SECItem pms = { siBuffer, (unsigned char*)att->attrib.pValue,
att->attrib.ulValueLen };
SECItem pms = { siBuffer };
/* HPUX won't let a structure member be initialized with the
* value of a variable, but the address of a local variable. :-/
*/
pms.data = (unsigned char*)att->attrib.pValue;
pms.len = att->attrib.ulValueLen;
status = TLS_PRF(&pms, "master secret", &crsr, &master, isFIPS);
if (status != SECSuccess) {
@ -4839,10 +4844,12 @@ CK_RV NSC_DeriveKey( CK_SESSION_HANDLE hSession,
if (isTLS) {
SECStatus status;
SECItem srcr = { siBuffer, srcrdata, sizeof srcrdata };
SECItem keyblk = { siBuffer, key_block, block_needed };
SECItem master = { siBuffer,
(unsigned char*)att->attrib.pValue,
att->attrib.ulValueLen };
SECItem keyblk = { siBuffer, key_block };
SECItem master = { siBuffer };
keyblk.len = block_needed;
master.data = (unsigned char*)att->attrib.pValue;
master.len = att->attrib.ulValueLen;
status = TLS_PRF(&master, "key expansion", &srcr, &keyblk,
isFIPS);