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

fix charset conversion: bug 185167 r=kaie sr=sspitzer

This commit is contained in:
jgmyers%speakeasy.net 2004-01-28 03:44:38 +00:00
Родитель 40f3136034
Коммит ca5e04ee48
1 изменённых файлов: 6 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
security/manager/ssl/src/nsNSSCertificate.cpp
Просмотреть файл

@ -1273,7 +1273,7 @@ ProcessName(CERTName *name, nsINSSComponent *nssComponent, PRUnichar **value)
if(!decodeItem) { if(!decodeItem) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
avavalue.AssignWithConversion((char*)decodeItem->data, decodeItem->len); avavalue = NS_ConvertUTF8toUTF16((char*)decodeItem->data, decodeItem->len);
SECITEM_FreeItem(decodeItem, PR_TRUE); SECITEM_FreeItem(decodeItem, PR_TRUE);
params[0] = type.get(); params[0] = type.get();
@ -1460,7 +1460,7 @@ nsNSSCertificate::CreateTBSCertificateASN1Struct(nsIASN1Sequence **retSequence,
return NS_OK; return NS_OK;
} }
#ifdef DEBUG_javi #if defined(DEBUG_javi) || defined(DEBUG_jgmyers)
void void
DumpASN1Object(nsIASN1Object *object, unsigned int level) DumpASN1Object(nsIASN1Object *object, unsigned int level)
{ {
@ -1479,14 +1479,13 @@ DumpASN1Object(nsIASN1Object *object, unsigned int level)
nsCOMPtr<nsIASN1Sequence> sequence(do_QueryInterface(object)); nsCOMPtr<nsIASN1Sequence> sequence(do_QueryInterface(object));
if (sequence) { if (sequence) {
printf ("%s ", NS_ConvertUCS2toUTF8(dispNameU).get()); printf ("%s ", NS_ConvertUCS2toUTF8(dispNameU).get());
sequence->GetProcessObjects(&processObjects); sequence->GetIsValidContainer(&processObjects);
if (processObjects) { if (processObjects) {
printf("\n"); printf("\n");
sequence->GetASN1Objects(getter_AddRefs(asn1Objects)); sequence->GetASN1Objects(getter_AddRefs(asn1Objects));
asn1Objects->Count(&numObjects); asn1Objects->GetLength(&numObjects);
for (i=0; i<numObjects;i++) { for (i=0; i<numObjects;i++) {
isupports = dont_AddRef(asn1Objects->ElementAt(i)); asn1Objects->QueryElementAt(i, NS_GET_IID(nsISupports), getter_AddRefs(currObject));
currObject = do_QueryInterface(isupports);
DumpASN1Object(currObject, level+1); DumpASN1Object(currObject, level+1);
} }
} else { } else {
@ -1520,7 +1519,7 @@ nsNSSCertificate::CreateASN1Struct()
nsXPIDLCString title; nsXPIDLCString title;
GetWindowTitle(getter_Copies(title)); GetWindowTitle(getter_Copies(title));
mASN1Structure->SetDisplayName(NS_ConvertASCIItoUCS2(title)); mASN1Structure->SetDisplayName(NS_ConvertUTF8toUCS2(title));
// This sequence will be contain the tbsCertificate, signatureAlgorithm, // This sequence will be contain the tbsCertificate, signatureAlgorithm,
// and signatureValue. // and signatureValue.
nsresult rv; nsresult rv;