diff options
-rwxr-xr-x | security/nss/lib/libpkix/include/pkix_errorstrings.h | 1 | ||||
-rw-r--r-- | security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c | 3 | ||||
-rw-r--r-- | security/nss/lib/util/secerr.h | 1 |
3 files changed, 3 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 */ diff --git a/security/nss/lib/util/secerr.h b/security/nss/lib/util/secerr.h index a2d43cdd3..663cd42b1 100644 --- a/security/nss/lib/util/secerr.h +++ b/security/nss/lib/util/secerr.h @@ -213,6 +213,7 @@ SEC_ERROR_OCSP_BAD_SIGNATURE = (SEC_ERROR_BASE + 157), SEC_ERROR_OUT_OF_SEARCH_LIMITS = (SEC_ERROR_BASE + 158), SEC_ERROR_INVALID_POLICY_MAPPING = (SEC_ERROR_BASE + 159), SEC_ERROR_POLICY_VALIDATION_FAILED = (SEC_ERROR_BASE + 160), +/* No longer used. Unknown AIA location types are now silently ignored. */ SEC_ERROR_UNKNOWN_AIA_LOCATION_TYPE = (SEC_ERROR_BASE + 161), SEC_ERROR_BAD_HTTP_RESPONSE = (SEC_ERROR_BASE + 162), SEC_ERROR_BAD_LDAP_RESPONSE = (SEC_ERROR_BASE + 163), |