mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix for 167615 - fix for crash with bad CRLs from token. Also fix error handling

This commit is contained in:
jpierre%netscape.com 2002-09-28 00:05:34 +00:00
Родитель 2db164211e
Коммит 6ce325d896
1 изменённых файлов: 20 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

32
security/nss/lib/pk11wrap/pk11cert.c
Просмотреть файл

@ -34,6 +34,8 @@
* This file implements the Symkey wrapper and the PKCS context * This file implements the Symkey wrapper and the PKCS context
* Interfaces. * Interfaces.
*/ */
#include "secport.h"
#include "seccomon.h" #include "seccomon.h"
#include "secmod.h" #include "secmod.h"
#include "nssilock.h" #include "nssilock.h"
@ -838,25 +840,31 @@ pk11_CollectCrls(PK11SlotInfo *slot, CK_OBJECT_HANDLE crlID, void *arg)
{ CKA_NETSCAPE_URL, NULL, 0}, { CKA_NETSCAPE_URL, NULL, 0},
}; };
const int fetchCrlSize = sizeof(fetchCrl)/sizeof(fetchCrl[2]); const int fetchCrlSize = sizeof(fetchCrl)/sizeof(fetchCrl[2]);
SECStatus rv; CK_RV crv;
SECStatus rv = SECFailure;
rv = PK11_GetAttributes(head->arena,slot,crlID,fetchCrl,fetchCrlSize); crv = PK11_GetAttributes(head->arena,slot,crlID,fetchCrl,fetchCrlSize);
if (rv == SECFailure) { if (CKR_OK != crv) {
PORT_SetError(PK11_MapError(crv));
goto loser;
}
if (!fetchCrl[1].pValue) {
PORT_SetError(SEC_ERROR_CRL_INVALID);
goto loser; goto loser;
} }
rv = SECFailure;
new_node = (CERTCrlNode *)PORT_ArenaAlloc(head->arena, sizeof(CERTCrlNode)); new_node = (CERTCrlNode *)PORT_ArenaAlloc(head->arena, sizeof(CERTCrlNode));
if (new_node == NULL) { if (new_node == NULL) {
goto loser; goto loser;
} }
if (fetchCrl[1].pValue && *((CK_BBOOL *)fetchCrl[1].pValue)) if (*((CK_BBOOL *)fetchCrl[1].pValue))
new_node->type = SEC_KRL_TYPE; new_node->type = SEC_KRL_TYPE;
else else
new_node->type = SEC_CRL_TYPE; new_node->type = SEC_CRL_TYPE;
derCrl.type = 0; derCrl.type = siBuffer;
derCrl.data = (unsigned char *)fetchCrl[0].pValue; derCrl.data = (unsigned char *)fetchCrl[0].pValue;
derCrl.len = fetchCrl[0].ulValueLen; derCrl.len = fetchCrl[0].ulValueLen;
new_node->crl=CERT_DecodeDERCrl(head->arena,&derCrl,new_node->type); new_node->crl=CERT_DecodeDERCrl(head->arena,&derCrl,new_node->type);
@ -3227,7 +3235,7 @@ PK11_GetKeyIDFromCert(CERTCertificate *cert, void *wincx)
item = PORT_ZNew(SECItem); item = PORT_ZNew(SECItem);
if (item) { if (item) {
item->data = theTemplate[0].pValue; item->data = (unsigned char*) theTemplate[0].pValue;
item->len = theTemplate[0].ulValueLen; item->len = theTemplate[0].ulValueLen;
} }
@ -3256,7 +3264,7 @@ PK11_GetKeyIDFromPrivateKey(SECKEYPrivateKey *key, void *wincx)
item = PORT_ZNew(SECItem); item = PORT_ZNew(SECItem);
if (item) { if (item) {
item->data = theTemplate[0].pValue; item->data = (unsigned char*) theTemplate[0].pValue;
item->len = theTemplate[0].ulValueLen; item->len = theTemplate[0].ulValueLen;
} }
@ -3399,7 +3407,7 @@ pk11_GetLowLevelKeyFromHandle(PK11SlotInfo *slot, CK_OBJECT_HANDLE handle) {
return NULL; return NULL;
} }
item->data = theTemplate[0].pValue; item->data = (unsigned char*) theTemplate[0].pValue;
item->len =theTemplate[0].ulValueLen; item->len =theTemplate[0].ulValueLen;
return item; return item;
@ -3936,7 +3944,7 @@ PK11_FindSMimeProfile(PK11SlotInfo **slot, char *emailAddr,
if (!profileTime) { if (!profileTime) {
SECItem profileSubject; SECItem profileSubject;
profileSubject.data = smimeData[0].pValue; profileSubject.data = (unsigned char*) smimeData[0].pValue;
profileSubject.len = smimeData[0].ulValueLen; profileSubject.len = smimeData[0].ulValueLen;
if (!SECITEM_ItemsAreEqual(&profileSubject,name)) { if (!SECITEM_ItemsAreEqual(&profileSubject,name)) {
goto loser; goto loser;
@ -3948,13 +3956,13 @@ PK11_FindSMimeProfile(PK11SlotInfo **slot, char *emailAddr,
goto loser; goto loser;
} }
emailProfile->data = smimeData[1].pValue; emailProfile->data = (unsigned char*) smimeData[1].pValue;
emailProfile->len = smimeData[1].ulValueLen; emailProfile->len = smimeData[1].ulValueLen;
if (profileTime) { if (profileTime) {
*profileTime = (SECItem *)PORT_ZAlloc(sizeof(SECItem)); *profileTime = (SECItem *)PORT_ZAlloc(sizeof(SECItem));
if (*profileTime) { if (*profileTime) {
(*profileTime)->data = smimeData[0].pValue; (*profileTime)->data = (unsigned char*) smimeData[0].pValue;
(*profileTime)->len = smimeData[0].ulValueLen; (*profileTime)->len = smimeData[0].ulValueLen;
} }
} }