diff options
| author | Dennis Jackson <djackson@mozilla.com> | 2023-03-03 21:43:37 +0000 |
|---|---|---|
| committer | Dennis Jackson <djackson@mozilla.com> | 2023-03-03 21:43:37 +0000 |
| commit | fcdd8f6f67f6e8456b3e24e7b32e66dd1d3766fa (patch) | |
| tree | f9122d37362061e4a4a51620707f24b27ccb15e0 /lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapcertstore.c | |
| parent | 9c96685d30a7e4be01688d593414035761bafa98 (diff) | |
| download | nss-hg-fcdd8f6f67f6e8456b3e24e7b32e66dd1d3766fa.tar.gz | |
Bug 1820175 - Fix various compiler warnings in NSS. r=jschanck.
Differential Revision: https://phabricator.services.mozilla.com/D171581
Diffstat (limited to 'lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapcertstore.c')
| -rw-r--r-- | lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapcertstore.c | 93 |
1 files changed, 45 insertions, 48 deletions
diff --git a/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapcertstore.c b/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapcertstore.c index 1b5d7577e..dd32334ab 100644 --- a/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapcertstore.c +++ b/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapcertstore.c @@ -309,7 +309,7 @@ pkix_pl_LdapCertStore_BuildCrlList( } /* pkix crl own the der. */ PKIX_CHECK( - pkix_pl_CRL_CreateWithSignedCRL(nssCrl, + pkix_pl_CRL_CreateWithSignedCRL(nssCrl, derCrlCopy, NULL, &crl, plContext), PKIX_CRLCREATEWITHSIGNEDCRLFAILED); /* Left control over memory pointed by derCrlCopy and @@ -427,7 +427,7 @@ pkix_pl_LdapCertStore_DestroyAVAList( static PKIX_Error * pkix_pl_LdapCertStore_MakeNameAVAList( PLArenaPool *arena, - PKIX_PL_X500Name *subjectName, + PKIX_PL_X500Name *subjectName, LDAPNameComponent ***pList, void *plContext) { @@ -874,55 +874,52 @@ pkix_pl_LdapCertStore_GetCRL( PKIX_LISTGETLENGTHFAILED); if (numNames > 0) { - for (thisName = 0; thisName < numNames; thisName++) { - PKIX_CHECK(PKIX_List_GetItem - (issuerNames, - thisName, - (PKIX_PL_Object **)&issuer, + /* + * LDAP Servers don't seem to be able to handle + * requests with more than more than one name. + * So only use first name. + */ + PKIX_CHECK(PKIX_List_GetItem + (issuerNames, + thisName, + (PKIX_PL_Object **)&issuer, + plContext), + PKIX_LISTGETITEMFAILED); + + PKIX_CHECK + (pkix_pl_LdapCertStore_MakeNameAVAList + (requestArena, + issuer, + &(requestParams.nc), plContext), - PKIX_LISTGETITEMFAILED); - - PKIX_CHECK - (pkix_pl_LdapCertStore_MakeNameAVAList - (requestArena, - issuer, - &(requestParams.nc), - plContext), - PKIX_LDAPCERTSTOREMAKENAMEAVALISTFAILED); - - PKIX_DECREF(issuer); - - if (*requestParams.nc == NULL) { - /* - * The issuer may not include any - * components that we know how to - * encode. We do not return an error, - * because the caller did not - * necessarily do anything wrong, but - * we return an empty List. - */ - PKIX_PL_NSSCALL - (CERTSTORE, PORT_FreeArena, - (requestArena, PR_FALSE)); - - PKIX_CHECK(PKIX_List_Create - (&filteredCRLs, plContext), - PKIX_LISTCREATEFAILED); - - PKIX_CHECK(PKIX_List_SetImmutable - (filteredCRLs, plContext), - PKIX_LISTSETIMMUTABLEFAILED); - - *pNBIOContext = NULL; - *pCrlList = filteredCRLs; - goto cleanup; - } + PKIX_LDAPCERTSTOREMAKENAMEAVALISTFAILED); + + PKIX_DECREF(issuer); + if (*requestParams.nc == NULL) { /* - * LDAP Servers don't seem to be able to handle - * requests with more than more than one name. - */ - break; + * The issuer may not include any + * components that we know how to + * encode. We do not return an error, + * because the caller did not + * necessarily do anything wrong, but + * we return an empty List. + */ + PKIX_PL_NSSCALL + (CERTSTORE, PORT_FreeArena, + (requestArena, PR_FALSE)); + + PKIX_CHECK(PKIX_List_Create + (&filteredCRLs, plContext), + PKIX_LISTCREATEFAILED); + + PKIX_CHECK(PKIX_List_SetImmutable + (filteredCRLs, plContext), + PKIX_LISTSETIMMUTABLEFAILED); + + *pNBIOContext = NULL; + *pCrlList = filteredCRLs; + goto cleanup; } } else { PKIX_ERROR(PKIX_IMPOSSIBLECRITERIONFORCRLQUERY); |