From 21b30d0cf20e8229676a166ab8669a9c0a9bab81 Mon Sep 17 00:00:00 2001
From: "jgmyers%speakeasy.net" <jgmyers%speakeasy.net>
Date: Wed, 28 Jan 2004 03:44:38 +0000
Subject: [PATCH] fix charset conversion: bug 185167 r=kaie sr=sspitzer

---
 security/manager/ssl/src/nsNSSCertificate.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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