diff --git a/mozilla/security/nss/lib/dev/ckhelper.c b/mozilla/security/nss/lib/dev/ckhelper.c
index 3ec3acb4b64..7637d719e20 100644
--- a/mozilla/security/nss/lib/dev/ckhelper.c
+++ b/mozilla/security/nss/lib/dev/ckhelper.c
@@ -32,7 +32,7 @@
  */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: ckhelper.c,v $ $Revision: 1.17 $ $Date: 2002-03-15 19:51:27 $ $Name: not supported by cvs2svn $";
+static const char CVS_ID[] = "@(#) $RCSfile: ckhelper.c,v $ $Revision: 1.17.2.1 $ $Date: 2002-04-09 18:25:10 $ $Name: not supported by cvs2svn $";
 #endif /* DEBUG */
 
 #ifndef DEV_H
@@ -177,7 +177,9 @@ nssCKObject_GetAttributes
 	 * of the attributes we passed. For those tokens read them one at
 	 * a time */
 	for (i=0; i < count; i++) {
-	    if (obj_template[i].ulValueLen == 0) {
+	    if ((obj_template[i].ulValueLen == 0) 
+				|| (obj_template[i].ulValueLen == -1)) {
+		obj_template[i].ulValueLen=0;
 		(void) nssCKObject_GetAttributes(object,&obj_template[i], 1,
 			arenaOpt, session, slot);
 	    }