Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Unified Diff: nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.c

Issue 133273035: Update third_party/nss to 3.15.5 Beta 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c ('k') | nss/lib/nss/nss.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.c
===================================================================
--- nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.c (revision 245298)
+++ nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.c (working copy)
@@ -107,33 +107,16 @@
PKIX_Boolean *pResult,
void *plContext)
{
- PKIX_UInt32 secondType;
- SECComparison cmpResult;
+ PKIX_Int32 cmpResult;
PKIX_ENTER(OID, "pkix_pl_OID_Equals");
PKIX_NULLCHECK_THREE(first, second, pResult);
- PKIX_CHECK(pkix_CheckType(first, PKIX_OID_TYPE, plContext),
- PKIX_FIRSTARGUMENTNOTANOID);
-
- PKIX_CHECK(PKIX_PL_Object_GetType(second, &secondType, plContext),
- PKIX_COULDNOTGETTYPEOFSECONDARGUMENT);
-
- *pResult = PKIX_FALSE;
-
- /*
- * Do a quick check that the second object is an OID.
- * If so, check that their lengths are equal.
- */
- if (secondType != PKIX_OID_TYPE) {
- goto cleanup;
- }
-
PKIX_CHECK(pkix_pl_OID_Comparator
(first, second, &cmpResult, plContext),
PKIX_OIDCOMPARATORFAILED);
- *pResult = (cmpResult == SECEqual);
+ *pResult = (cmpResult == 0);
cleanup:
PKIX_RETURN(OID);
« no previous file with comments | « nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c ('k') | nss/lib/nss/nss.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698