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

Side by Side Diff: mozilla/security/nss/lib/certhigh/certvfypkix.c

Issue 12197027: Merge NSS_3_14_2_RTM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « mozilla/security/nss/lib/certhigh/certvfy.c ('k') | mozilla/security/nss/lib/certhigh/ocsp.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 /* 4 /*
5 * nss_pkix_proxy.h 5 * nss_pkix_proxy.h
6 * 6 *
7 * PKIX - NSS proxy functions 7 * PKIX - NSS proxy functions
8 * 8 *
9 * NOTE: All structures, functions, data types are parts of library private 9 * NOTE: All structures, functions, data types are parts of library private
10 * api and are subjects to change in any following releases. 10 * api and are subjects to change in any following releases.
(...skipping 1693 matching lines...) Expand 10 before | Expand all | Expand 10 after
1704 if (!chainVerifyCallback || !chainVerifyCallback->isChainValid) { 1704 if (!chainVerifyCallback || !chainVerifyCallback->isChainValid) {
1705 PORT_SetError(errCode); 1705 PORT_SetError(errCode);
1706 r = SECFailure; 1706 r = SECFailure;
1707 break; 1707 break;
1708 } 1708 }
1709 1709
1710 nssContext->chainVerifyCallback = *chainVerifyCallback; 1710 nssContext->chainVerifyCallback = *chainVerifyCallback;
1711 } 1711 }
1712 break; 1712 break;
1713 1713
1714 case cert_pi_useOnlyTrustAnchors:
1715 error =
1716 PKIX_ProcessingParams_SetUseOnlyTrustAnchors(procParams,
1717 (PRBool)(param->value.scalar.b != 0),
1718 plContext);
1719 break;
1720
1714 default: 1721 default:
1715 PORT_SetError(errCode); 1722 PORT_SetError(errCode);
1716 r = SECFailure; 1723 r = SECFailure;
1717 break; 1724 break;
1718 } 1725 }
1719 1726
1720 if (policyOIDList != NULL) 1727 if (policyOIDList != NULL)
1721 PKIX_PL_Object_DecRef((PKIX_PL_Object *)policyOIDList, plContext); 1728 PKIX_PL_Object_DecRef((PKIX_PL_Object *)policyOIDList, plContext);
1722 1729
1723 if (date != NULL) 1730 if (date != NULL)
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
2309 2316
2310 } while (errorGenerated); 2317 } while (errorGenerated);
2311 2318
2312 runningLeakTest = PKIX_FALSE; 2319 runningLeakTest = PKIX_FALSE;
2313 PR_ATOMIC_DECREMENT(&parallelFnInvocationCount); 2320 PR_ATOMIC_DECREMENT(&parallelFnInvocationCount);
2314 usePKIXValidationEngine = savedUsePkixEngFlag; 2321 usePKIXValidationEngine = savedUsePkixEngFlag;
2315 #endif /* PKIX_OBJECT_LEAK_TEST */ 2322 #endif /* PKIX_OBJECT_LEAK_TEST */
2316 2323
2317 return r; 2324 return r;
2318 } 2325 }
OLDNEW
« no previous file with comments | « mozilla/security/nss/lib/certhigh/certvfy.c ('k') | mozilla/security/nss/lib/certhigh/ocsp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698