summaryrefslogtreecommitdiff
path: root/security/nss/lib/libpkix
diff options
context:
space:
mode:
authorwtc%google.com <devnull@localhost>2010-09-27 21:51:28 +0000
committerwtc%google.com <devnull@localhost>2010-09-27 21:51:28 +0000
commita6722a6734f48ef67b4e550c23ab1484c9319bdf (patch)
tree388a802ef0eb96122a2750daade1dfc3cd2220a6 /security/nss/lib/libpkix
parent778e390f0a325b1c1e3a6401be4d87f28f527c05 (diff)
downloadnss-hg-a6722a6734f48ef67b4e550c23ab1484c9319bdf.tar.gz
Bug 528743: ignore unknown AIA location types. r=alexei.
Modified Files: libpkix/include/pkix_errorstrings.h libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c util/secerr.h
Diffstat (limited to 'security/nss/lib/libpkix')
-rwxr-xr-xsecurity/nss/lib/libpkix/include/pkix_errorstrings.h1
-rw-r--r--security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/lib/libpkix/include/pkix_errorstrings.h b/security/nss/lib/libpkix/include/pkix_errorstrings.h
index 7f218d383..92d802de4 100755
--- a/security/nss/lib/libpkix/include/pkix_errorstrings.h
+++ b/security/nss/lib/libpkix/include/pkix_errorstrings.h
@@ -1071,7 +1071,6 @@ PKIX_ERRORENTRY(UNDEFINEDEQUALSCALLBACK,Undefined equals callback,0),
PKIX_ERRORENTRY(UNEXPECTEDERRORINESTABLISHINGCONNECTION,Unexpected error in establishing connection,0),
PKIX_ERRORENTRY(UNEXPECTEDRESULTCODEINRESPONSE,Unexpected result code in Response,SEC_ERROR_BAD_LDAP_RESPONSE),
PKIX_ERRORENTRY(UNKNOWNFORMAT,Unknown format,SEC_ERROR_INVALID_ARGS),
-PKIX_ERRORENTRY(UNKNOWNINFOACCESSTYPE,Unknown InfoAccess type,SEC_ERROR_UNKNOWN_AIA_LOCATION_TYPE),
PKIX_ERRORENTRY(UNKNOWNINFOACCESSMETHOD,Unknown InfoAccess method,SEC_ERROR_BAD_INFO_ACCESS_METHOD),
PKIX_ERRORENTRY(UNKNOWNOBJECTOID,Unknown object OID,0),
PKIX_ERRORENTRY(UNKNOWNOBJECTTYPE,Unknown object type,0),
diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c
index 3d1dc64cc..29be9dd52 100644
--- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c
+++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c
@@ -658,7 +658,8 @@ PKIX_PL_AIAMgr_GetAIACerts(
PKIX_AIAMGRGETLDAPCERTSFAILED);
} else {
/* We only support http and ldap requests. */
- PKIX_ERROR(PKIX_UNKNOWNINFOACCESSTYPE);
+ PKIX_DECREF(ia);
+ continue;
}
if (nbio != NULL) { /* WOULDBLOCK */