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

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

Issue 3135002: Update to NSS 3.12.7 and NSPR 4.8.6.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/
Patch Set: Created 10 years, 4 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
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.61 $ $Date: 2010/02/10 02:04:32 $"; 38 static const char CVS_ID[] = "@(#) $RCSfile: trustdomain.c,v $ $Revision: 1.62 $ $Date: 2010/05/21 00:02:48 $";
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
49 #ifndef PKI1T_H
50 #include "pki1t.h"
51 #endif /* PKI1T_H */
52
53 #include "cert.h" 49 #include "cert.h"
54 #include "pki3hack.h" 50 #include "pki3hack.h"
55 #include "pk11pub.h" 51 #include "pk11pub.h"
56 #include "nssrwlk.h" 52 #include "nssrwlk.h"
57 53
58 #define NSSTRUSTDOMAIN_DEFAULT_CACHE_SIZE 32 54 #define NSSTRUSTDOMAIN_DEFAULT_CACHE_SIZE 32
59 55
60 extern const NSSError NSS_ERROR_NOT_FOUND; 56 extern const NSSError NSS_ERROR_NOT_FOUND;
61 57
62 typedef PRUint32 nssUpdateLevel; 58 typedef PRUint32 nssUpdateLevel;
(...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after
1285 NSS_IMPLEMENT NSSCryptoContext * 1281 NSS_IMPLEMENT NSSCryptoContext *
1286 NSSTrustDomain_CreateCryptoContextForAlgorithmAndParameters ( 1282 NSSTrustDomain_CreateCryptoContextForAlgorithmAndParameters (
1287 NSSTrustDomain *td, 1283 NSSTrustDomain *td,
1288 NSSAlgorithmAndParameters *ap 1284 NSSAlgorithmAndParameters *ap
1289 ) 1285 )
1290 { 1286 {
1291 nss_SetError(NSS_ERROR_NOT_FOUND); 1287 nss_SetError(NSS_ERROR_NOT_FOUND);
1292 return NULL; 1288 return NULL;
1293 } 1289 }
1294 1290
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698