3 files changed, 5 insertions, 3 deletions
diff --git a/nss/cmd/certutil/certext.c b/nss/cmd/certutil/certext.c
index b080f06..0be3eb1 100644
--- a/nss/cmd/certutil/certext.c
+++ b/nss/cmd/certutil/certext.c
@@ -980,8 +980,6 @@ AddNameConstraints(void *extHandle)
             GEN_BREAK(SECFailure);
         }
 
-        (void)SEC_ASN1EncodeInteger(arena, &current->min, 0);
-
         if (!GetGeneralName(arena, &current->name, PR_TRUE)) {
             GEN_BREAK(SECFailure);
         }
diff --git a/nss/cmd/certutil/certutil.c b/nss/cmd/certutil/certutil.c
index 24acdbc..fbc752c 100644
--- a/nss/cmd/certutil/certutil.c
+++ b/nss/cmd/certutil/certutil.c
@@ -1002,9 +1002,12 @@ ListModules(void)
 
     /* look at each slot*/
     for (le = list->head; le; le = le->next) {
+        char *token_uri = PK11_GetTokenURI(le->slot);
         printf("\n");
         printf("    slot: %s\n", PK11_GetSlotName(le->slot));
         printf("   token: %s\n", PK11_GetTokenName(le->slot));
+        printf("     uri: %s\n", token_uri);
+        PORT_Free(token_uri);
     }
     PK11_FreeSlotList(list);
 
diff --git a/nss/cmd/certutil/keystuff.c b/nss/cmd/certutil/keystuff.c
index 268ad47..1569313 100644
--- a/nss/cmd/certutil/keystuff.c
+++ b/nss/cmd/certutil/keystuff.c
@@ -52,9 +52,10 @@ static int
 UpdateRNG(void)
 {
     char randbuf[RAND_BUF_SIZE];
-    int fd, count;
+    int fd;
     int c;
     int rv = 0;
+    size_t count;
 #ifdef XP_UNIX
     cc_t orig_cc_min;
     cc_t orig_cc_time;