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

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

Issue 10540165: Update NSS to NSS 3.13.5 (from NSS 3.13.3). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: Created 8 years, 6 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: pkistore.c,v $ $Revision: 1.34 $ $D ate: 2010/12/17 02:34:07 $"; 38 static const char CVS_ID[] = "@(#) $RCSfile: pkistore.c,v $ $Revision: 1.34.2.1 $ $Date: 2012/05/17 21:40:54 $";
39 #endif /* DEBUG */ 39 #endif /* DEBUG */
40 40
41 #ifndef PKIM_H 41 #ifndef PKIM_H
42 #include "pkim.h" 42 #include "pkim.h"
43 #endif /* PKIM_H */ 43 #endif /* PKIM_H */
44 44
45 #ifndef PKI_H 45 #ifndef PKI_H
46 #include "pki.h" 46 #include "pki.h"
47 #endif /* PKI_H */ 47 #endif /* PKI_H */
48 48
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 NSSUTF8 *nickname; 451 NSSUTF8 *nickname;
452 nssList *subjectList = (nssList *)v; 452 nssList *subjectList = (nssList *)v;
453 struct nickname_template_str *nt = (struct nickname_template_str *)a; 453 struct nickname_template_str *nt = (struct nickname_template_str *)a;
454 nssrv = nssList_GetArray(subjectList, (void **)&c, 1); 454 nssrv = nssList_GetArray(subjectList, (void **)&c, 1);
455 nickname = nssCertificate_GetNickname(c, NULL); 455 nickname = nssCertificate_GetNickname(c, NULL);
456 if (nssrv == PR_SUCCESS && nickname && 456 if (nssrv == PR_SUCCESS && nickname &&
457 nssUTF8_Equal(nickname, nt->nickname, &nssrv)) 457 nssUTF8_Equal(nickname, nt->nickname, &nssrv))
458 { 458 {
459 nt->subjectList = subjectList; 459 nt->subjectList = subjectList;
460 } 460 }
461 nss_ZFreeIf(nickname);
461 } 462 }
462 463
463 /* 464 /*
464 * Find all cached certs with this label. 465 * Find all cached certs with this label.
465 */ 466 */
466 NSS_IMPLEMENT NSSCertificate ** 467 NSS_IMPLEMENT NSSCertificate **
467 nssCertificateStore_FindCertificatesByNickname ( 468 nssCertificateStore_FindCertificatesByNickname (
468 nssCertificateStore *store, 469 nssCertificateStore *store,
469 const NSSUTF8 *nickname, 470 const NSSUTF8 *nickname,
470 NSSCertificate *rvOpt[], 471 NSSCertificate *rvOpt[],
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 nssCertificateStore *store, 766 nssCertificateStore *store,
766 void (* cert_dump_iter)(const void *, void *, void *), 767 void (* cert_dump_iter)(const void *, void *, void *),
767 void *arg 768 void *arg
768 ) 769 )
769 { 770 {
770 PZ_Lock(store->lock); 771 PZ_Lock(store->lock);
771 nssHash_Iterate(store->issuer_and_serial, cert_dump_iter, arg); 772 nssHash_Iterate(store->issuer_and_serial, cert_dump_iter, arg);
772 PZ_Unlock(store->lock); 773 PZ_Unlock(store->lock);
773 } 774 }
774 775
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698