From 36b53465f3960b386796adb3b4ef671f6a63a3bb Mon Sep 17 00:00:00 2001
From: "relyea%netscape.com" <devnull@localhost>
Date: Wed, 6 Sep 2000 22:24:00 +0000
Subject: Make the framework compile with the rest of NSS. Include a 'live'
 certdata.txt with those certs we have permission to push to open source
 (additional certs will be added as we get permission from the owners).

---
 security/nss/lib/ckfw/slot.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'security/nss/lib/ckfw/slot.c')

diff --git a/security/nss/lib/ckfw/slot.c b/security/nss/lib/ckfw/slot.c
index 6530f04d3..4e2b0831c 100644
--- a/security/nss/lib/ckfw/slot.c
+++ b/security/nss/lib/ckfw/slot.c
@@ -387,11 +387,11 @@ nssCKFWSlot_GetSlotDescription
         goto done;
       }
     } else {
-      fwSlot->slotDescription = "";
+      fwSlot->slotDescription = (NSSUTF8 *) "";
     }
   }
 
-  (void)nssUTF8_CopyIntoFixedBuffer(fwSlot->slotDescription, slotDescription, 64, ' ');
+  (void)nssUTF8_CopyIntoFixedBuffer(fwSlot->slotDescription, (char *)slotDescription, 64, ' ');
   error = CKR_OK;
 
  done:
@@ -437,11 +437,11 @@ nssCKFWSlot_GetManufacturerID
         goto done;
       }
     } else {
-      fwSlot->manufacturerID = "";
+      fwSlot->manufacturerID = (NSSUTF8 *) "";
     }
   }
 
-  (void)nssUTF8_CopyIntoFixedBuffer(fwSlot->manufacturerID, manufacturerID, 32, ' ');
+  (void)nssUTF8_CopyIntoFixedBuffer(fwSlot->manufacturerID, (char *)manufacturerID, 32, ' ');
   error = CKR_OK;
 
  done:
-- 
cgit v1.2.1