Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/libpkix/pkix/params/pkix_procparams.c

Index: mozilla/security/nss/lib/libpkix/pkix/params/pkix_procparams.c
===================================================================
--- mozilla/security/nss/lib/libpkix/pkix/params/pkix_procparams.c	(revision 180567)
+++ mozilla/security/nss/lib/libpkix/pkix/params/pkix_procparams.c	(working copy)
@@ -556,6 +556,7 @@
 
         params->useAIAForCertFetching = PKIX_FALSE;
         params->qualifyTargetCert = PKIX_TRUE;
+        params->useOnlyTrustAnchors = PKIX_TRUE;
 
         *pParams = params;
         params = NULL;
@@ -687,6 +688,44 @@
         PKIX_RETURN(PROCESSINGPARAMS);
 }
 
+/**
+ * FUNCTION: PKIX_ProcessingParams_SetUseOnlyTrustAnchors
+ * (see comments in pkix_params.h)
+ */
+PKIX_Error *
+PKIX_ProcessingParams_GetUseOnlyTrustAnchors(
+        PKIX_ProcessingParams *params,
+        PKIX_Boolean *pUseOnlyTrustAnchors,
+        void *plContext)
+{
+        PKIX_ENTER(PROCESSINGPARAMS,
+                   "PKIX_ProcessingParams_SetUseTrustAnchorsOnly");
+        PKIX_NULLCHECK_TWO(params, pUseOnlyTrustAnchors);
+
+        *pUseOnlyTrustAnchors = params->useOnlyTrustAnchors;
+
+        PKIX_RETURN(PROCESSINGPARAMS);
+}
+
+/**
+ * FUNCTION: PKIX_ProcessingParams_SetUseOnlyTrustAnchors
+ * (see comments in pkix_params.h)
+ */
+PKIX_Error *
+PKIX_ProcessingParams_SetUseOnlyTrustAnchors(
+        PKIX_ProcessingParams *params,
+        PKIX_Boolean useOnlyTrustAnchors,
+        void *plContext)
+{
+        PKIX_ENTER(PROCESSINGPARAMS,
+                   "PKIX_ProcessingParams_SetUseTrustAnchorsOnly");
+        PKIX_NULLCHECK_ONE(params);
+
+        params->useOnlyTrustAnchors = useOnlyTrustAnchors;
+
+        PKIX_RETURN(PROCESSINGPARAMS);
+}
+
 /*
  * FUNCTION: PKIX_ProcessingParams_GetDate (see comments in pkix_params.h)
  */