From 029bcfe189eae5eebbaf58ccff4e1200dd78b228 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 23 Dec 2020 19:02:52 +0000 Subject: Issue #1693 - Update NSS to 3.59.1.1 This updates to MoonchildProductions/NSS@bd49b2b88 in the repo created for our consumption of the library. --- security/nss/lib/jar/jar.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'security/nss/lib/jar') diff --git a/security/nss/lib/jar/jar.c b/security/nss/lib/jar/jar.c index 00a55463e..5a38def9d 100644 --- a/security/nss/lib/jar/jar.c +++ b/security/nss/lib/jar/jar.c @@ -18,7 +18,7 @@ static void jar_destroy_list(ZZList *list); static int -jar_find_first_cert(JAR_Signer *signer, int type, JAR_Item **it); +jar_find_first_cert(JAR_Signer *signer, jarType type, JAR_Item **it); /* * J A R _ n e w @@ -323,7 +323,7 @@ JAR_find_next(JAR_Context *ctx, JAR_Item **it) { JAR *jar; ZZList *list = NULL; - int finding; + jarType finding; JAR_Signer *signer = NULL; PORT_Assert(ctx != NULL); @@ -413,6 +413,13 @@ JAR_find_next(JAR_Context *ctx, JAR_Item **it) case jarTypeSign: ctx->next = ZZ_ListHead(signer->certs); break; + + case jarTypeMF: + case jarTypeMeta: + case jarTypePhy: + case jarTypeSect: + case jarTypeOwner: + break; } } PORT_Assert(ctx->next != NULL); @@ -447,7 +454,7 @@ JAR_find_next(JAR_Context *ctx, JAR_Item **it) } static int -jar_find_first_cert(JAR_Signer *signer, int type, JAR_Item **it) +jar_find_first_cert(JAR_Signer *signer, jarType type, JAR_Item **it) { ZZLink *link; ZZList *list = signer->certs; -- cgit v1.2.3