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

Patch for 193961 - incorporate Wan-Teh's feedback

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@137989 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jpierre%netscape.com
2003-02-19 21:50:49 +00:00
parent c6d382b9df
commit 5ec2a5f051
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/security/nss/lib/util/quickder.c
View File

@@ -894,6 +894,11 @@ SECStatus SEC_QuickDERDecodeItem(PRArenaPool* arena, void* dest,
savpos = PORT_ArenaMark(arena);
newsrc = *src;
rv = DecodeItem(dest, templateEntry, &newsrc, arena, PR_TRUE);
if (SECSuccess == rv && newsrc.len)
{
rv = SECFailure;
PORT_SetError(SEC_ERROR_EXTRA_INPUT);
}
if (SECSuccess != rv)
{
PORT_ArenaRelease(arena, savpos);
@@ -901,11 +906,6 @@ SECStatus SEC_QuickDERDecodeItem(PRArenaPool* arena, void* dest,
else
{
PORT_ArenaUnmark(arena, savpos);
if (newsrc.len)
{
rv = SECFailure;
PORT_SetError(SEC_ERROR_BAD_DER_EXTRA_DATA);
}
}
}

2
mozilla/security/nss/lib/util/secerr.h
View File

@@ -185,7 +185,7 @@ SEC_ERROR_BAD_TEMPLATE = (SEC_ERROR_BASE + 136),
SEC_ERROR_CRL_NOT_FOUND = (SEC_ERROR_BASE + 137),
SEC_ERROR_REUSED_ISSUER_AND_SERIAL = (SEC_ERROR_BASE + 138),
SEC_ERROR_BUSY = (SEC_ERROR_BASE + 139),
SEC_ERROR_BAD_DER_EXTRA_DATA = (SEC_ERROR_BASE + 140)
SEC_ERROR_EXTRA_INPUT = (SEC_ERROR_BASE + 140)
} SECErrorCodes;
#endif /* NO_SECURITY_ERROR_ENUM */