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

Side by Side Diff: nss/mozilla/security/nss/lib/pk11wrap/pk11nobj.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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 tobjID = pk11_FindObjectByTemplate(slot, tobjTemplate, 109 tobjID = pk11_FindObjectByTemplate(slot, tobjTemplate,
110 sizeof(tobjTemplate)/sizeof(tobjTemplate[0] )); 110 sizeof(tobjTemplate)/sizeof(tobjTemplate[0] ));
111 if( CK_INVALID_HANDLE == tobjID ) { 111 if( CK_INVALID_HANDLE == tobjID ) {
112 return PR_FALSE; 112 return PR_FALSE;
113 } 113 }
114 114
115 arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); 115 arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
116 if( NULL == arena ) return PR_FALSE; 116 if( NULL == arena ) return PR_FALSE;
117 117
118 /* Unfortunately, it seems that PK11_GetAttributes doesn't deal 118 /* Unfortunately, it seems that PK11_GetAttributes doesn't deal
119 * well with nonexistant attributes. I guess we have to check 119 * well with nonexistent attributes. I guess we have to check
120 * the trust info fields one at a time. 120 * the trust info fields one at a time.
121 */ 121 */
122 122
123 /* We could verify CKA_CERT_HASH here */ 123 /* We could verify CKA_CERT_HASH here */
124 124
125 /* We could verify CKA_EXPIRES here */ 125 /* We could verify CKA_EXPIRES here */
126 126
127 127
128 /* "Purpose" trust information */ 128 /* "Purpose" trust information */
129 serverAuth = pk11_GetTrustField(slot, arena, tobjID, CKA_TRUST_SERVER_AUTH); 129 serverAuth = pk11_GetTrustField(slot, arena, tobjID, CKA_TRUST_SERVER_AUTH);
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 } while (0); 808 } while (0);
809 809
810 if (crl == NULL) { 810 if (crl == NULL) {
811 SEC_DestroyCrl (newCrl); 811 SEC_DestroyCrl (newCrl);
812 } 812 }
813 if (caCert) { 813 if (caCert) {
814 CERT_DestroyCertificate(caCert); 814 CERT_DestroyCertificate(caCert);
815 } 815 }
816 return (crl); 816 return (crl);
817 } 817 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698