diff options
Diffstat (limited to 'nss/cmd/libpkix/pkix/crlsel')
| -rw-r--r-- | nss/cmd/libpkix/pkix/crlsel/test_comcrlselparams.c | 565 | ||||
| -rw-r--r-- | nss/cmd/libpkix/pkix/crlsel/test_crlselector.c | 187 |
2 files changed, 356 insertions, 396 deletions
diff --git a/nss/cmd/libpkix/pkix/crlsel/test_comcrlselparams.c b/nss/cmd/libpkix/pkix/crlsel/test_comcrlselparams.c index b2420f4..fcc5ef5 100644 --- a/nss/cmd/libpkix/pkix/crlsel/test_comcrlselparams.c +++ b/nss/cmd/libpkix/pkix/crlsel/test_comcrlselparams.c @@ -16,426 +16,391 @@ static void *plContext = NULL; static void testIssuer(PKIX_ComCRLSelParams *goodObject) { - PKIX_PL_String *issuer1String = NULL; - PKIX_PL_String *issuer2String = NULL; - PKIX_PL_String *issuer3String = NULL; - PKIX_PL_X500Name *issuerName1 = NULL; - PKIX_PL_X500Name *issuerName2 = NULL; - PKIX_PL_X500Name *issuerName3 = NULL; - PKIX_List *setIssuerList = NULL; - PKIX_List *getIssuerList = NULL; - PKIX_PL_String *issuerListString = NULL; - char *name1 = "CN=yassir,OU=bcn,OU=east,O=sun,C=us"; - char *name2 = "CN=richard,OU=bcn,OU=east,O=sun,C=us"; - char *name3 = "CN=hanfei,OU=bcn,OU=east,O=sun,C=us"; - PKIX_Int32 length; - PKIX_Boolean result = PKIX_FALSE; - char *expectedAscii = - "(CN=yassir,OU=bcn,OU=east,O=sun," - "C=us, CN=richard,OU=bcn,OU=east,O=sun,C=us, " - "CN=hanfei,OU=bcn,OU=east,O=sun,C=us)"; - - PKIX_TEST_STD_VARS(); - - subTest("PKIX_ComCRLSelParams Create Issuers"); - - length = PL_strlen(name1); + PKIX_PL_String *issuer1String = NULL; + PKIX_PL_String *issuer2String = NULL; + PKIX_PL_String *issuer3String = NULL; + PKIX_PL_X500Name *issuerName1 = NULL; + PKIX_PL_X500Name *issuerName2 = NULL; + PKIX_PL_X500Name *issuerName3 = NULL; + PKIX_List *setIssuerList = NULL; + PKIX_List *getIssuerList = NULL; + PKIX_PL_String *issuerListString = NULL; + char *name1 = "CN=yassir,OU=bcn,OU=east,O=sun,C=us"; + char *name2 = "CN=richard,OU=bcn,OU=east,O=sun,C=us"; + char *name3 = "CN=hanfei,OU=bcn,OU=east,O=sun,C=us"; + PKIX_Int32 length; + PKIX_Boolean result = PKIX_FALSE; + char *expectedAscii = + "(CN=yassir,OU=bcn,OU=east,O=sun," + "C=us, CN=richard,OU=bcn,OU=east,O=sun,C=us, " + "CN=hanfei,OU=bcn,OU=east,O=sun,C=us)"; - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_String_Create - (PKIX_UTF8, - name1, - length, - &issuer1String, - plContext)); - - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_X500Name_Create(issuer1String, - &issuerName1, - plContext)); + PKIX_TEST_STD_VARS(); - length = PL_strlen(name2); + subTest("PKIX_ComCRLSelParams Create Issuers"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_String_Create - (PKIX_UTF8, - name2, - length, - &issuer2String, - plContext)); + length = PL_strlen(name1); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_X500Name_Create(issuer2String, - &issuerName2, - plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_String_Create(PKIX_UTF8, + name1, + length, + &issuer1String, + plContext)); - length = PL_strlen(name3); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_X500Name_Create(issuer1String, + &issuerName1, + plContext)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_String_Create - (PKIX_UTF8, - name3, - length, - &issuer3String, - plContext)); + length = PL_strlen(name2); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_X500Name_Create - (issuer3String, - &issuerName3, - plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_String_Create(PKIX_UTF8, + name2, + length, + &issuer2String, + plContext)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_List_Create(&setIssuerList, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_X500Name_Create(issuer2String, + &issuerName2, + plContext)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_List_AppendItem - (setIssuerList, - (PKIX_PL_Object *)issuerName1, - plContext)); + length = PL_strlen(name3); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_List_AppendItem - (setIssuerList, - (PKIX_PL_Object *)issuerName2, - plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_String_Create(PKIX_UTF8, + name3, + length, + &issuer3String, + plContext)); - subTest("PKIX_ComCRLSelParams_AddIssuerName"); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_X500Name_Create(issuer3String, + &issuerName3, + plContext)); - /* Test adding an issuer to an empty list */ - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_AddIssuerName - (goodObject, issuerName3, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_List_Create(&setIssuerList, plContext)); - subTest("PKIX_ComCRLSelParams_GetIssuerNames"); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_List_AppendItem(setIssuerList, + (PKIX_PL_Object *)issuerName1, + plContext)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_GetIssuerNames - (goodObject, &getIssuerList, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_List_AppendItem(setIssuerList, + (PKIX_PL_Object *)issuerName2, + plContext)); - /* DECREF for GetIssuerNames */ - PKIX_TEST_DECREF_BC(getIssuerList); - /* DECREF for AddIssuerName so next SetIssuerName start clean */ - PKIX_TEST_DECREF_BC(getIssuerList); + subTest("PKIX_ComCRLSelParams_AddIssuerName"); - /* Test setting issuer names on the list */ - subTest("PKIX_ComCRLSelParams_SetIssuerNames"); + /* Test adding an issuer to an empty list */ + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_AddIssuerName(goodObject, issuerName3, plContext)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_SetIssuerNames - (goodObject, setIssuerList, plContext)); + subTest("PKIX_ComCRLSelParams_GetIssuerNames"); - subTest("PKIX_ComCRLSelParams_GetIssuerNames"); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_GetIssuerNames(goodObject, &getIssuerList, plContext)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_GetIssuerNames - (goodObject, &getIssuerList, plContext)); + /* DECREF for GetIssuerNames */ + PKIX_TEST_DECREF_BC(getIssuerList); + /* DECREF for AddIssuerName so next SetIssuerName start clean */ + PKIX_TEST_DECREF_BC(getIssuerList); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Equals - ((PKIX_PL_Object *)setIssuerList, - (PKIX_PL_Object *)getIssuerList, - &result, - plContext)); + /* Test setting issuer names on the list */ + subTest("PKIX_ComCRLSelParams_SetIssuerNames"); - if (result != PKIX_TRUE) { - pkixTestErrorMsg = "unexpected Issuers mismatch"; - } + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_SetIssuerNames(goodObject, setIssuerList, plContext)); - /* Test adding an issuer to existing list */ - subTest("PKIX_ComCRLSelParams_AddIssuerName"); + subTest("PKIX_ComCRLSelParams_GetIssuerNames"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_AddIssuerName - (goodObject, issuerName3, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_GetIssuerNames(goodObject, &getIssuerList, plContext)); - subTest("PKIX_ComCRLSelParams_GetIssuerNames"); - PKIX_TEST_DECREF_BC(getIssuerList); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Equals((PKIX_PL_Object *)setIssuerList, + (PKIX_PL_Object *)getIssuerList, + &result, + plContext)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_GetIssuerNames - (goodObject, &getIssuerList, plContext)); + if (result != PKIX_TRUE) { + pkixTestErrorMsg = "unexpected Issuers mismatch"; + } + /* Test adding an issuer to existing list */ + subTest("PKIX_ComCRLSelParams_AddIssuerName"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_ToString - ((PKIX_PL_Object *)getIssuerList, - &issuerListString, - plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_AddIssuerName(goodObject, issuerName3, plContext)); - testToStringHelper((PKIX_PL_Object *)getIssuerList, - expectedAscii, plContext); + subTest("PKIX_ComCRLSelParams_GetIssuerNames"); + PKIX_TEST_DECREF_BC(getIssuerList); -cleanup: + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_GetIssuerNames(goodObject, &getIssuerList, plContext)); + + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_ToString((PKIX_PL_Object *)getIssuerList, + &issuerListString, + plContext)); - PKIX_TEST_DECREF_AC(issuer1String); - PKIX_TEST_DECREF_AC(issuer2String); - PKIX_TEST_DECREF_AC(issuer3String); - PKIX_TEST_DECREF_AC(issuerListString); - PKIX_TEST_DECREF_AC(issuerName1); - PKIX_TEST_DECREF_AC(issuerName2); - PKIX_TEST_DECREF_AC(issuerName3); - PKIX_TEST_DECREF_AC(setIssuerList); - PKIX_TEST_DECREF_AC(getIssuerList); + testToStringHelper((PKIX_PL_Object *)getIssuerList, + expectedAscii, plContext); - PKIX_TEST_RETURN(); +cleanup: + PKIX_TEST_DECREF_AC(issuer1String); + PKIX_TEST_DECREF_AC(issuer2String); + PKIX_TEST_DECREF_AC(issuer3String); + PKIX_TEST_DECREF_AC(issuerListString); + PKIX_TEST_DECREF_AC(issuerName1); + PKIX_TEST_DECREF_AC(issuerName2); + PKIX_TEST_DECREF_AC(issuerName3); + PKIX_TEST_DECREF_AC(setIssuerList); + PKIX_TEST_DECREF_AC(getIssuerList); + + PKIX_TEST_RETURN(); } -static -void testCertificateChecking( - char *dataCentralDir, - char *goodInput, - PKIX_ComCRLSelParams *goodObject) +static void +testCertificateChecking( + char *dataCentralDir, + char *goodInput, + PKIX_ComCRLSelParams *goodObject) { - PKIX_PL_Cert *setCert = NULL; - PKIX_PL_Cert *getCert = NULL; - PKIX_Boolean result = PKIX_FALSE; + PKIX_PL_Cert *setCert = NULL; + PKIX_PL_Cert *getCert = NULL; + PKIX_Boolean result = PKIX_FALSE; - PKIX_TEST_STD_VARS(); + PKIX_TEST_STD_VARS(); - subTest("Test CertificateChecking Cert Create"); - setCert = createCert(dataCentralDir, goodInput, plContext); - if (setCert == NULL) { - pkixTestErrorMsg = "create certificate failed"; - goto cleanup; - } + subTest("Test CertificateChecking Cert Create"); + setCert = createCert(dataCentralDir, goodInput, plContext); + if (setCert == NULL) { + pkixTestErrorMsg = "create certificate failed"; + goto cleanup; + } - subTest("PKIX_ComCRLSelParams_SetCertificateChecking"); + subTest("PKIX_ComCRLSelParams_SetCertificateChecking"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_SetCertificateChecking - (goodObject, setCert, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_SetCertificateChecking(goodObject, setCert, plContext)); - subTest("PKIX_ComCRLSelParams_GetCertificateChecking"); + subTest("PKIX_ComCRLSelParams_GetCertificateChecking"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_GetCertificateChecking - (goodObject, &getCert, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_GetCertificateChecking(goodObject, &getCert, plContext)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Equals - ((PKIX_PL_Object *)setCert, - (PKIX_PL_Object *)getCert, - &result, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Equals((PKIX_PL_Object *)setCert, + (PKIX_PL_Object *)getCert, + &result, plContext)); - if (result != PKIX_TRUE) { - pkixTestErrorMsg = "unexpected Cert mismatch"; - } + if (result != PKIX_TRUE) { + pkixTestErrorMsg = "unexpected Cert mismatch"; + } cleanup: - PKIX_TEST_DECREF_AC(setCert); - PKIX_TEST_DECREF_AC(getCert); + PKIX_TEST_DECREF_AC(setCert); + PKIX_TEST_DECREF_AC(getCert); - PKIX_TEST_RETURN(); + PKIX_TEST_RETURN(); } -static -void testDateAndTime(PKIX_ComCRLSelParams *goodObject){ +static void +testDateAndTime(PKIX_ComCRLSelParams *goodObject) +{ - PKIX_PL_Date *setDate = NULL; - PKIX_PL_Date *getDate = NULL; - char *asciiDate = "040329134847Z"; - PKIX_Boolean result = PKIX_FALSE; + PKIX_PL_Date *setDate = NULL; + PKIX_PL_Date *getDate = NULL; + char *asciiDate = "040329134847Z"; + PKIX_Boolean result = PKIX_FALSE; - PKIX_TEST_STD_VARS(); + PKIX_TEST_STD_VARS(); - subTest("PKIX_ComCRLSelParams_Date Create"); - setDate = createDate(asciiDate, plContext); + subTest("PKIX_ComCRLSelParams_Date Create"); + setDate = createDate(asciiDate, plContext); - subTest("PKIX_ComCRLSelParams_SetDateAndTime"); - PKIX_TEST_EXPECT_NO_ERROR - (PKIX_ComCRLSelParams_SetDateAndTime - (goodObject, setDate, plContext)); + subTest("PKIX_ComCRLSelParams_SetDateAndTime"); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_SetDateAndTime(goodObject, setDate, plContext)); - subTest("PKIX_ComCRLSelParams_GetDateAndTime"); - PKIX_TEST_EXPECT_NO_ERROR - (PKIX_ComCRLSelParams_GetDateAndTime - (goodObject, &getDate, plContext)); + subTest("PKIX_ComCRLSelParams_GetDateAndTime"); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_GetDateAndTime(goodObject, &getDate, plContext)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Equals - ((PKIX_PL_Object *)setDate, - (PKIX_PL_Object *)getDate, - &result, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Equals((PKIX_PL_Object *)setDate, + (PKIX_PL_Object *)getDate, + &result, plContext)); - if (result != PKIX_TRUE) { - pkixTestErrorMsg = "unexpected DateAndTime mismatch"; - } + if (result != PKIX_TRUE) { + pkixTestErrorMsg = "unexpected DateAndTime mismatch"; + } cleanup: - PKIX_TEST_DECREF_AC(setDate); - PKIX_TEST_DECREF_AC(getDate); + PKIX_TEST_DECREF_AC(setDate); + PKIX_TEST_DECREF_AC(getDate); - PKIX_TEST_RETURN(); + PKIX_TEST_RETURN(); } -static -void testMaxMinCRLNumbers(PKIX_ComCRLSelParams *goodObject){ - PKIX_PL_BigInt *setMaxCrlNumber = NULL; - PKIX_PL_BigInt *getMaxCrlNumber = NULL; - PKIX_PL_BigInt *setMinCrlNumber = NULL; - PKIX_PL_BigInt *getMinCrlNumber = NULL; - char *asciiCrlNumber1 = "01"; - char *asciiCrlNumber99999 = "0909090909"; - PKIX_PL_String *crlNumber1String = NULL; - PKIX_PL_String *crlNumber99999String = NULL; +static void +testMaxMinCRLNumbers(PKIX_ComCRLSelParams *goodObject) +{ + PKIX_PL_BigInt *setMaxCrlNumber = NULL; + PKIX_PL_BigInt *getMaxCrlNumber = NULL; + PKIX_PL_BigInt *setMinCrlNumber = NULL; + PKIX_PL_BigInt *getMinCrlNumber = NULL; + char *asciiCrlNumber1 = "01"; + char *asciiCrlNumber99999 = "0909090909"; + PKIX_PL_String *crlNumber1String = NULL; + PKIX_PL_String *crlNumber99999String = NULL; - PKIX_Boolean result = PKIX_FALSE; + PKIX_Boolean result = PKIX_FALSE; - PKIX_TEST_STD_VARS(); + PKIX_TEST_STD_VARS(); - subTest("PKIX_ComCRLSelParams_SetMinCRLNumber"); + subTest("PKIX_ComCRLSelParams_SetMinCRLNumber"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_String_Create - (PKIX_ESCASCII, - asciiCrlNumber1, - PL_strlen(asciiCrlNumber1), - &crlNumber1String, - NULL)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_String_Create(PKIX_ESCASCII, + asciiCrlNumber1, + PL_strlen(asciiCrlNumber1), + &crlNumber1String, + NULL)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_BigInt_Create - (crlNumber1String, &setMinCrlNumber, NULL)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_BigInt_Create(crlNumber1String, &setMinCrlNumber, NULL)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_SetMinCRLNumber - (goodObject, setMinCrlNumber, NULL)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_SetMinCRLNumber(goodObject, setMinCrlNumber, NULL)); - subTest("PKIX_ComCRLSelParams_GetMinCRLNumber"); + subTest("PKIX_ComCRLSelParams_GetMinCRLNumber"); - PKIX_TEST_EXPECT_NO_ERROR - (PKIX_ComCRLSelParams_GetMinCRLNumber - (goodObject, &getMinCrlNumber, NULL)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_GetMinCRLNumber(goodObject, &getMinCrlNumber, NULL)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Equals - ((PKIX_PL_Object *)setMinCrlNumber, - (PKIX_PL_Object *)getMinCrlNumber, - &result, NULL)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Equals((PKIX_PL_Object *)setMinCrlNumber, + (PKIX_PL_Object *)getMinCrlNumber, + &result, NULL)); - if (result != PKIX_TRUE) { - pkixTestErrorMsg = "unexpected Minimum CRL Number mismatch"; - } + if (result != PKIX_TRUE) { + pkixTestErrorMsg = "unexpected Minimum CRL Number mismatch"; + } - subTest("PKIX_ComCRLSelParams_SetMaxCRLNumber"); + subTest("PKIX_ComCRLSelParams_SetMaxCRLNumber"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_String_Create - (PKIX_ESCASCII, - asciiCrlNumber99999, - PL_strlen(asciiCrlNumber99999), - &crlNumber99999String, - NULL)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_String_Create(PKIX_ESCASCII, + asciiCrlNumber99999, + PL_strlen(asciiCrlNumber99999), + &crlNumber99999String, + NULL)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_BigInt_Create - (crlNumber99999String, &setMaxCrlNumber, NULL)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_BigInt_Create(crlNumber99999String, &setMaxCrlNumber, NULL)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_SetMaxCRLNumber - (goodObject, setMaxCrlNumber, NULL)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_SetMaxCRLNumber(goodObject, setMaxCrlNumber, NULL)); - subTest("PKIX_ComCRLSelParams_GetMaxCRLNumber"); + subTest("PKIX_ComCRLSelParams_GetMaxCRLNumber"); - PKIX_TEST_EXPECT_NO_ERROR - (PKIX_ComCRLSelParams_GetMaxCRLNumber - (goodObject, &getMaxCrlNumber, NULL)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_GetMaxCRLNumber(goodObject, &getMaxCrlNumber, NULL)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Equals - ((PKIX_PL_Object *)setMaxCrlNumber, - (PKIX_PL_Object *)getMaxCrlNumber, - &result, NULL)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Equals((PKIX_PL_Object *)setMaxCrlNumber, + (PKIX_PL_Object *)getMaxCrlNumber, + &result, NULL)); - if (result != PKIX_TRUE) { - pkixTestErrorMsg = "unexpected Maximum CRL Number mismatch"; - } + if (result != PKIX_TRUE) { + pkixTestErrorMsg = "unexpected Maximum CRL Number mismatch"; + } cleanup: - PKIX_TEST_DECREF_AC(setMaxCrlNumber); - PKIX_TEST_DECREF_AC(getMaxCrlNumber); - PKIX_TEST_DECREF_AC(setMinCrlNumber); - PKIX_TEST_DECREF_AC(getMinCrlNumber); - PKIX_TEST_DECREF_AC(crlNumber1String); - PKIX_TEST_DECREF_AC(crlNumber99999String); + PKIX_TEST_DECREF_AC(setMaxCrlNumber); + PKIX_TEST_DECREF_AC(getMaxCrlNumber); + PKIX_TEST_DECREF_AC(setMinCrlNumber); + PKIX_TEST_DECREF_AC(getMinCrlNumber); + PKIX_TEST_DECREF_AC(crlNumber1String); + PKIX_TEST_DECREF_AC(crlNumber99999String); - PKIX_TEST_RETURN(); + PKIX_TEST_RETURN(); } -static -void testDuplicate(PKIX_ComCRLSelParams *goodObject){ +static void +testDuplicate(PKIX_ComCRLSelParams *goodObject) +{ - PKIX_ComCRLSelParams *dupObject = NULL; - PKIX_Boolean result = PKIX_FALSE; + PKIX_ComCRLSelParams *dupObject = NULL; + PKIX_Boolean result = PKIX_FALSE; - PKIX_TEST_STD_VARS(); + PKIX_TEST_STD_VARS(); - subTest("PKIX_ComCRLSelParams_Duplicate"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Duplicate - ((PKIX_PL_Object *)goodObject, - (PKIX_PL_Object **)&dupObject, - plContext)); + subTest("PKIX_ComCRLSelParams_Duplicate"); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Duplicate((PKIX_PL_Object *)goodObject, + (PKIX_PL_Object **)&dupObject, + plContext)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Equals - ((PKIX_PL_Object *)goodObject, - (PKIX_PL_Object *)dupObject, - &result, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Object_Equals((PKIX_PL_Object *)goodObject, + (PKIX_PL_Object *)dupObject, + &result, plContext)); - if (result != PKIX_TRUE) { - pkixTestErrorMsg = - "unexpected Duplicate ComCRLSelParams mismatch"; - } + if (result != PKIX_TRUE) { + pkixTestErrorMsg = + "unexpected Duplicate ComCRLSelParams mismatch"; + } cleanup: - PKIX_TEST_DECREF_AC(dupObject); - PKIX_TEST_RETURN(); + PKIX_TEST_DECREF_AC(dupObject); + PKIX_TEST_RETURN(); } -static -void printUsage(char *pName){ - printf("\nUSAGE: %s <central-data-dir>\n\n", pName); +static void +printUsage(char *pName) +{ + printf("\nUSAGE: %s <central-data-dir>\n\n", pName); } /* Functional tests for ComCRLSelParams public functions */ -int test_comcrlselparams(int argc, char *argv[]){ +int +test_comcrlselparams(int argc, char *argv[]) +{ - char *dataCentralDir = NULL; - char *goodInput = "yassir2yassir"; - PKIX_ComCRLSelParams *goodObject = NULL; - PKIX_ComCRLSelParams *diffObject = NULL; - PKIX_UInt32 actualMinorVersion; - PKIX_UInt32 j = 0; + char *dataCentralDir = NULL; + char *goodInput = "yassir2yassir"; + PKIX_ComCRLSelParams *goodObject = NULL; + PKIX_ComCRLSelParams *diffObject = NULL; + PKIX_UInt32 actualMinorVersion; + PKIX_UInt32 j = 0; - PKIX_TEST_STD_VARS(); + PKIX_TEST_STD_VARS(); - startTests("ComCRLSelParams"); + startTests("ComCRLSelParams"); - PKIX_TEST_EXPECT_NO_ERROR( - PKIX_PL_NssContext_Create(0, PKIX_FALSE, NULL, &plContext)); + PKIX_TEST_EXPECT_NO_ERROR( + PKIX_PL_NssContext_Create(0, PKIX_FALSE, NULL, &plContext)); - if (argc < 2){ - printUsage(argv[0]); - return (0); - } + if (argc < 2) { + printUsage(argv[0]); + return (0); + } - dataCentralDir = argv[j+1]; + dataCentralDir = argv[j + 1]; - subTest("PKIX_ComCRLSelParams_Create"); + subTest("PKIX_ComCRLSelParams_Create"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_Create - (&goodObject, - plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_Create(&goodObject, + plContext)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_Create - (&diffObject, - plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_Create(&diffObject, + plContext)); - testIssuer(goodObject); + testIssuer(goodObject); - testCertificateChecking(dataCentralDir, goodInput, goodObject); + testCertificateChecking(dataCentralDir, goodInput, goodObject); - testDateAndTime(goodObject); + testDateAndTime(goodObject); - testMaxMinCRLNumbers(goodObject); + testMaxMinCRLNumbers(goodObject); - testDuplicate(goodObject); + testDuplicate(goodObject); - PKIX_TEST_EQ_HASH_TOSTR_DUP - (goodObject, - goodObject, - diffObject, - NULL, - ComCRLSelParams, - PKIX_TRUE); + PKIX_TEST_EQ_HASH_TOSTR_DUP(goodObject, + goodObject, + diffObject, + NULL, + ComCRLSelParams, + PKIX_TRUE); cleanup: - PKIX_TEST_DECREF_AC(goodObject); - PKIX_TEST_DECREF_AC(diffObject); + PKIX_TEST_DECREF_AC(goodObject); + PKIX_TEST_DECREF_AC(diffObject); - PKIX_Shutdown(plContext); + PKIX_Shutdown(plContext); - PKIX_TEST_RETURN(); + PKIX_TEST_RETURN(); - endTests("ComCRLSelParams"); + endTests("ComCRLSelParams"); - return (0); + return (0); } diff --git a/nss/cmd/libpkix/pkix/crlsel/test_crlselector.c b/nss/cmd/libpkix/pkix/crlsel/test_crlselector.c index d614e11..f17406b 100644 --- a/nss/cmd/libpkix/pkix/crlsel/test_crlselector.c +++ b/nss/cmd/libpkix/pkix/crlsel/test_crlselector.c @@ -16,158 +16,153 @@ static void *plContext = NULL; static void testGetMatchCallback(PKIX_CRLSelector *goodObject) { - PKIX_CRLSelector_MatchCallback mCallback = NULL; + PKIX_CRLSelector_MatchCallback mCallback = NULL; - PKIX_TEST_STD_VARS(); + PKIX_TEST_STD_VARS(); - subTest("testGetMatchCallback"); + subTest("testGetMatchCallback"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_CRLSelector_GetMatchCallback - (goodObject, &mCallback, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_CRLSelector_GetMatchCallback(goodObject, &mCallback, plContext)); - if (mCallback == NULL) { - pkixTestErrorMsg = "MatchCallback is NULL"; - } + if (mCallback == NULL) { + pkixTestErrorMsg = "MatchCallback is NULL"; + } cleanup: - PKIX_TEST_RETURN(); - + PKIX_TEST_RETURN(); } -static -void testGetCRLSelectorContext(PKIX_CRLSelector *goodObject) +static void +testGetCRLSelectorContext(PKIX_CRLSelector *goodObject) { - PKIX_PL_Object *context = NULL; + PKIX_PL_Object *context = NULL; - PKIX_TEST_STD_VARS(); + PKIX_TEST_STD_VARS(); - subTest("testGetCRLSelectorContext"); + subTest("testGetCRLSelectorContext"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_CRLSelector_GetCRLSelectorContext - (goodObject, (void *)&context, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_CRLSelector_GetCRLSelectorContext(goodObject, (void *)&context, plContext)); - if (context == NULL) { - pkixTestErrorMsg = "CRLSelectorContext is NULL"; - } + if (context == NULL) { + pkixTestErrorMsg = "CRLSelectorContext is NULL"; + } cleanup: - PKIX_TEST_DECREF_AC(context); - PKIX_TEST_RETURN(); + PKIX_TEST_DECREF_AC(context); + PKIX_TEST_RETURN(); } -static -void testCommonCRLSelectorParams(PKIX_CRLSelector *goodObject){ - PKIX_ComCRLSelParams *setParams = NULL; - PKIX_ComCRLSelParams *getParams = NULL; - PKIX_PL_Date *setDate = NULL; - char *asciiDate = "040329134847Z"; +static void +testCommonCRLSelectorParams(PKIX_CRLSelector *goodObject) +{ + PKIX_ComCRLSelParams *setParams = NULL; + PKIX_ComCRLSelParams *getParams = NULL; + PKIX_PL_Date *setDate = NULL; + char *asciiDate = "040329134847Z"; - PKIX_TEST_STD_VARS(); + PKIX_TEST_STD_VARS(); - subTest("PKIX_ComCRLSelParams_Create"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_Create - (&setParams, - plContext)); + subTest("PKIX_ComCRLSelParams_Create"); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_Create(&setParams, + plContext)); - subTest("PKIX_ComCRLSelParams_Date Create"); + subTest("PKIX_ComCRLSelParams_Date Create"); - setDate = createDate(asciiDate, plContext); + setDate = createDate(asciiDate, plContext); - subTest("PKIX_ComCRLSelParams_SetDateAndTime"); + subTest("PKIX_ComCRLSelParams_SetDateAndTime"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_SetDateAndTime - (setParams, setDate, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_ComCRLSelParams_SetDateAndTime(setParams, setDate, plContext)); - subTest("PKIX_CRLSelector_SetCommonCRLSelectorParams"); + subTest("PKIX_CRLSelector_SetCommonCRLSelectorParams"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_CRLSelector_SetCommonCRLSelectorParams( - goodObject, setParams, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_CRLSelector_SetCommonCRLSelectorParams( + goodObject, setParams, plContext)); - subTest("PKIX_CRLSelector_GetCommonCRLSelectorParams"); + subTest("PKIX_CRLSelector_GetCommonCRLSelectorParams"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_CRLSelector_GetCommonCRLSelectorParams( - goodObject, &getParams, plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_CRLSelector_GetCommonCRLSelectorParams( + goodObject, &getParams, plContext)); - testEqualsHelper((PKIX_PL_Object *)setParams, - (PKIX_PL_Object *)getParams, - PKIX_TRUE, - plContext); + testEqualsHelper((PKIX_PL_Object *)setParams, + (PKIX_PL_Object *)getParams, + PKIX_TRUE, + plContext); - testHashcodeHelper((PKIX_PL_Object *)setParams, - (PKIX_PL_Object *)getParams, - PKIX_TRUE, - plContext); + testHashcodeHelper((PKIX_PL_Object *)setParams, + (PKIX_PL_Object *)getParams, + PKIX_TRUE, + plContext); cleanup: - PKIX_TEST_DECREF_AC(setDate); - PKIX_TEST_DECREF_AC(setParams); - PKIX_TEST_DECREF_AC(getParams); + PKIX_TEST_DECREF_AC(setDate); + PKIX_TEST_DECREF_AC(setParams); + PKIX_TEST_DECREF_AC(getParams); - PKIX_TEST_RETURN(); + PKIX_TEST_RETURN(); } /* Functional tests for CRLSelector public functions */ -int test_crlselector(int argc, char *argv[]){ +int +test_crlselector(int argc, char *argv[]) +{ - PKIX_PL_Date *context = NULL; - PKIX_CRLSelector *goodObject = NULL; - PKIX_CRLSelector *diffObject = NULL; - PKIX_UInt32 actualMinorVersion; - PKIX_UInt32 j = 0; - char *asciiDate = "040329134847Z"; + PKIX_PL_Date *context = NULL; + PKIX_CRLSelector *goodObject = NULL; + PKIX_CRLSelector *diffObject = NULL; + PKIX_UInt32 actualMinorVersion; + PKIX_UInt32 j = 0; + char *asciiDate = "040329134847Z"; - PKIX_TEST_STD_VARS(); + PKIX_TEST_STD_VARS(); - startTests("CRLSelector"); + startTests("CRLSelector"); - PKIX_TEST_EXPECT_NO_ERROR( - PKIX_PL_NssContext_Create(0, PKIX_FALSE, NULL, &plContext)); + PKIX_TEST_EXPECT_NO_ERROR( + PKIX_PL_NssContext_Create(0, PKIX_FALSE, NULL, &plContext)); - context = createDate(asciiDate, plContext); + context = createDate(asciiDate, plContext); - subTest("PKIX_CRLSelector_Create"); + subTest("PKIX_CRLSelector_Create"); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_CRLSelector_Create - (NULL, - (PKIX_PL_Object *)context, - &goodObject, - plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_CRLSelector_Create(NULL, + (PKIX_PL_Object *)context, + &goodObject, + plContext)); - PKIX_TEST_EXPECT_NO_ERROR(PKIX_CRLSelector_Create - (NULL, - (PKIX_PL_Object *)context, - &diffObject, - plContext)); + PKIX_TEST_EXPECT_NO_ERROR(PKIX_CRLSelector_Create(NULL, + (PKIX_PL_Object *)context, + &diffObject, + plContext)); - testGetMatchCallback(goodObject); + testGetMatchCallback(goodObject); - testGetCRLSelectorContext(goodObject); + testGetCRLSelectorContext(goodObject); - testCommonCRLSelectorParams(goodObject); + testCommonCRLSelectorParams(goodObject); - PKIX_TEST_EQ_HASH_TOSTR_DUP - (goodObject, - goodObject, - diffObject, - NULL, - CRLSelector, - PKIX_TRUE); + PKIX_TEST_EQ_HASH_TOSTR_DUP(goodObject, + goodObject, + diffObject, + NULL, + CRLSelector, + PKIX_TRUE); cleanup: - PKIX_TEST_DECREF_AC(goodObject); - PKIX_TEST_DECREF_AC(diffObject); - PKIX_TEST_DECREF_AC(context); + PKIX_TEST_DECREF_AC(goodObject); + PKIX_TEST_DECREF_AC(diffObject); + PKIX_TEST_DECREF_AC(context); - PKIX_Shutdown(plContext); + PKIX_Shutdown(plContext); - PKIX_TEST_RETURN(); + PKIX_TEST_RETURN(); - endTests("CRLSelector"); + endTests("CRLSelector"); - return (0); + return (0); } |