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

Side by Side Diff: nss/mozilla/security/nss/lib/certhigh/ocsp.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 21 matching lines...) Expand all
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 37
38 /* 38 /*
39 * Implementation of OCSP services, for both client and server. 39 * Implementation of OCSP services, for both client and server.
40 * (XXX, really, mostly just for client right now, but intended to do both.) 40 * (XXX, really, mostly just for client right now, but intended to do both.)
41 * 41 *
42 * $Id: ocsp.c,v 1.64 2010/02/01 20:09:31 wtc%google.com Exp $ 42 * $Id: ocsp.c,v 1.65 2010/06/07 19:03:27 kaie%kuix.de Exp $
43 */ 43 */
44 44
45 #include "prerror.h" 45 #include "prerror.h"
46 #include "prprf.h" 46 #include "prprf.h"
47 #include "plarena.h" 47 #include "plarena.h"
48 #include "prnetdb.h" 48 #include "prnetdb.h"
49 49
50 #include "seccomon.h" 50 #include "seccomon.h"
51 #include "secitem.h" 51 #include "secitem.h"
52 #include "secoidt.h" 52 #include "secoidt.h"
(...skipping 5129 matching lines...) Expand 10 before | Expand all | Expand 10 after
5182 SECStatus 5182 SECStatus
5183 cert_ProcessOCSPResponse(CERTCertDBHandle *handle, 5183 cert_ProcessOCSPResponse(CERTCertDBHandle *handle,
5184 CERTOCSPResponse *response, 5184 CERTOCSPResponse *response,
5185 CERTOCSPCertID *certID, 5185 CERTOCSPCertID *certID,
5186 CERTCertificate *signerCert, 5186 CERTCertificate *signerCert,
5187 int64 time, 5187 int64 time,
5188 PRBool *certIDWasConsumed, 5188 PRBool *certIDWasConsumed,
5189 SECStatus *cacheUpdateStatus) 5189 SECStatus *cacheUpdateStatus)
5190 { 5190 {
5191 SECStatus rv; 5191 SECStatus rv;
5192 SECStatus rv_cache; 5192 SECStatus rv_cache = SECSuccess;
5193 CERTOCSPSingleResponse *single = NULL; 5193 CERTOCSPSingleResponse *single = NULL;
5194 5194
5195 rv = ocsp_GetVerifiedSingleResponseForCertID(handle, response, certID, 5195 rv = ocsp_GetVerifiedSingleResponseForCertID(handle, response, certID,
5196 signerCert, time, &single); 5196 signerCert, time, &single);
5197 if (rv == SECSuccess) { 5197 if (rv == SECSuccess) {
5198 /* 5198 /*
5199 * Check whether the status says revoked, and if so 5199 * Check whether the status says revoked, and if so
5200 * how that compares to the time value passed into this routine. 5200 * how that compares to the time value passed into this routine.
5201 */ 5201 */
5202 rv = ocsp_SingleResponseCertHasGoodStatus(single, time); 5202 rv = ocsp_SingleResponseCertHasGoodStatus(single, time);
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
5715 PORT_SetError(SEC_ERROR_OCSP_UNAUTHORIZED_REQUEST); 5715 PORT_SetError(SEC_ERROR_OCSP_UNAUTHORIZED_REQUEST);
5716 break; 5716 break;
5717 case ocspResponse_other: 5717 case ocspResponse_other:
5718 case ocspResponse_unused: 5718 case ocspResponse_unused:
5719 default: 5719 default:
5720 PORT_SetError(SEC_ERROR_OCSP_UNKNOWN_RESPONSE_STATUS); 5720 PORT_SetError(SEC_ERROR_OCSP_UNKNOWN_RESPONSE_STATUS);
5721 break; 5721 break;
5722 } 5722 }
5723 return SECFailure; 5723 return SECFailure;
5724 } 5724 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698