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

Side by Side Diff: nss/mozilla/security/nss/lib/freebl/shvfy.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 1
2 /* ***** BEGIN LICENSE BLOCK ***** 2 /* ***** BEGIN LICENSE BLOCK *****
3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
4 * 4 *
5 * The contents of this file are subject to the Mozilla Public License Version 5 * The contents of this file are subject to the Mozilla Public License Version
6 * 1.1 (the "License"); you may not use this file except in compliance with 6 * 1.1 (the "License"); you may not use this file except in compliance with
7 * the License. You may obtain a copy of the License at 7 * the License. You may obtain a copy of the License at
8 * http://www.mozilla.org/MPL/ 8 * http://www.mozilla.org/MPL/
9 * 9 *
10 * Software distributed under the License is distributed on an "AS IS" basis, 10 * Software distributed under the License is distributed on an "AS IS" basis,
(...skipping 16 matching lines...) Expand all
27 * in which case the provisions of the GPL or the LGPL are applicable instead 27 * in which case the provisions of the GPL or the LGPL are applicable instead
28 * of those above. If you wish to allow use of your version of this file only 28 * of those above. If you wish to allow use of your version of this file only
29 * under the terms of either the GPL or the LGPL, and not to allow others to 29 * under the terms of either the GPL or the LGPL, and not to allow others to
30 * use your version of this file under the terms of the MPL, indicate your 30 * use your version of this file under the terms of the MPL, indicate your
31 * decision by deleting the provisions above and replace them with the notice 31 * decision by deleting the provisions above and replace them with the notice
32 * and other provisions required by the GPL or the LGPL. If you do not delete 32 * and other provisions required by the GPL or the LGPL. If you do not delete
33 * the provisions above, a recipient may use your version of this file under 33 * the provisions above, a recipient may use your version of this file under
34 * the terms of any one of the MPL, the GPL or the LGPL. 34 * the terms of any one of the MPL, the GPL or the LGPL.
35 * 35 *
36 * ***** END LICENSE BLOCK ***** */ 36 * ***** END LICENSE BLOCK ***** */
37 /* $Id: shvfy.c,v 1.11 2008/11/18 19:48:24 rrelyea%redhat.com Exp $ */ 37 /* $Id: shvfy.c,v 1.13 2010/04/29 00:17:52 rrelyea%redhat.com Exp $ */
38 38
39 #ifdef FREEBL_NO_DEPEND 39 #ifdef FREEBL_NO_DEPEND
40 #include "stubs.h" 40 #include "stubs.h"
41 #endif 41 #endif
42 42
43 #include "shsign.h" 43 #include "shsign.h"
44 #include "prlink.h" 44 #include "prlink.h"
45 #include "prio.h" 45 #include "prio.h"
46 #include "blapi.h" 46 #include "blapi.h"
47 #include "seccomon.h" 47 #include "seccomon.h"
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 { 305 {
306 if (name == NULL) { 306 if (name == NULL) {
307 /* 307 /*
308 * If name is NULL, freebl is statically linked into softoken. 308 * If name is NULL, freebl is statically linked into softoken.
309 * softoken will call BLAPI_SHVerify next to verify itself. 309 * softoken will call BLAPI_SHVerify next to verify itself.
310 */ 310 */
311 return PR_TRUE; 311 return PR_TRUE;
312 } 312 }
313 return BLAPI_SHVerify(name, (PRFuncPtr) decodeInt); 313 return BLAPI_SHVerify(name, (PRFuncPtr) decodeInt);
314 } 314 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698