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

Side by Side Diff: mozilla/security/nss/lib/pki/trustdomain.c

Issue 606034: NSS: update to 3.12.6 RC0 (Closed)
Patch Set: Created 10 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
OLDNEW
1 /* ***** BEGIN LICENSE BLOCK ***** 1 /* ***** BEGIN LICENSE BLOCK *****
2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
3 * 3 *
4 * The contents of this file are subject to the Mozilla Public License Version 4 * The contents of this file are subject to the Mozilla Public License Version
5 * 1.1 (the "License"); you may not use this file except in compliance with 5 * 1.1 (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at 6 * the License. You may obtain a copy of the License at
7 * http://www.mozilla.org/MPL/ 7 * http://www.mozilla.org/MPL/
8 * 8 *
9 * Software distributed under the License is distributed on an "AS IS" basis, 9 * Software distributed under the License is distributed on an "AS IS" basis,
10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
(...skipping 17 matching lines...) Expand all
28 * under the terms of either the GPL or the LGPL, and not to allow others to 28 * under the terms of either the GPL or the LGPL, and not to allow others to
29 * use your version of this file under the terms of the MPL, indicate your 29 * use your version of this file under the terms of the MPL, indicate your
30 * decision by deleting the provisions above and replace them with the notice 30 * decision by deleting the provisions above and replace them with the notice
31 * and other provisions required by the GPL or the LGPL. If you do not delete 31 * and other provisions required by the GPL or the LGPL. If you do not delete
32 * the provisions above, a recipient may use your version of this file under 32 * the provisions above, a recipient may use your version of this file under
33 * the terms of any one of the MPL, the GPL or the LGPL. 33 * the terms of any one of the MPL, the GPL or the LGPL.
34 * 34 *
35 * ***** END LICENSE BLOCK ***** */ 35 * ***** END LICENSE BLOCK ***** */
36 36
37 #ifdef DEBUG 37 #ifdef DEBUG
38 static const char CVS_ID[] = "@(#) $RCSfile: trustdomain.c,v $ $Revision: 1.60 $ $Date: 2008/10/06 02:56:00 $"; 38 static const char CVS_ID[] = "@(#) $RCSfile: trustdomain.c,v $ $Revision: 1.61 $ $Date: 2010/02/10 02:04:32 $";
39 #endif /* DEBUG */ 39 #endif /* DEBUG */
40 40
41 #ifndef DEV_H 41 #ifndef DEV_H
42 #include "dev.h" 42 #include "dev.h"
43 #endif /* DEV_H */ 43 #endif /* DEV_H */
44 44
45 #ifndef PKIM_H 45 #ifndef PKIM_H
46 #include "pkim.h" 46 #include "pkim.h"
47 #endif /* PKIM_H */ 47 #endif /* PKIM_H */
48 48
(...skipping 992 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 NSSSlot **slotp; 1041 NSSSlot **slotp;
1042 nssPKIObjectCollection *collection = NULL; 1042 nssPKIObjectCollection *collection = NULL;
1043 nssPKIObjectCallback pkiCallback; 1043 nssPKIObjectCallback pkiCallback;
1044 nssUpdateLevel updateLevel; 1044 nssUpdateLevel updateLevel;
1045 NSSCertificate **cached = NULL; 1045 NSSCertificate **cached = NULL;
1046 nssList *certList; 1046 nssList *certList;
1047 1047
1048 certList = nssList_Create(NULL, PR_FALSE); 1048 certList = nssList_Create(NULL, PR_FALSE);
1049 if (!certList) 1049 if (!certList)
1050 return NULL; 1050 return NULL;
1051 (void *)nssTrustDomain_GetCertsFromCache(td, certList); 1051 (void)nssTrustDomain_GetCertsFromCache(td, certList);
1052 cached = get_certs_from_list(certList); 1052 cached = get_certs_from_list(certList);
1053 collection = nssCertificateCollection_Create(td, cached); 1053 collection = nssCertificateCollection_Create(td, cached);
1054 nssCertificateArray_Destroy(cached); 1054 nssCertificateArray_Destroy(cached);
1055 nssList_Destroy(certList); 1055 nssList_Destroy(certList);
1056 if (!collection) { 1056 if (!collection) {
1057 return (PRStatus *)NULL; 1057 return (PRStatus *)NULL;
1058 } 1058 }
1059 /* obtain the current set of active slots in the trust domain */ 1059 /* obtain the current set of active slots in the trust domain */
1060 slots = nssTrustDomain_GetActiveSlots(td, &updateLevel); 1060 slots = nssTrustDomain_GetActiveSlots(td, &updateLevel);
1061 if (!slots) { 1061 if (!slots) {
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
1285 NSS_IMPLEMENT NSSCryptoContext * 1285 NSS_IMPLEMENT NSSCryptoContext *
1286 NSSTrustDomain_CreateCryptoContextForAlgorithmAndParameters ( 1286 NSSTrustDomain_CreateCryptoContextForAlgorithmAndParameters (
1287 NSSTrustDomain *td, 1287 NSSTrustDomain *td,
1288 NSSAlgorithmAndParameters *ap 1288 NSSAlgorithmAndParameters *ap
1289 ) 1289 )
1290 { 1290 {
1291 nss_SetError(NSS_ERROR_NOT_FOUND); 1291 nss_SetError(NSS_ERROR_NOT_FOUND);
1292 return NULL; 1292 return NULL;
1293 } 1293 }
1294 1294
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698