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

Side by Side Diff: nss/lib/certhigh/ocspsig.c

Issue 105893015: Update third_party/nss to NSS 3.15.4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Remove SVN property on new file nss/lib/freebl/rsapkcs.c Created 6 years, 11 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
« no previous file with comments | « nss/lib/certhigh/ocspi.h ('k') | nss/lib/ckfw/builtins/bfind.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 4
5 #include "plarena.h" 5 #include "plarena.h"
6 6
7 #include "seccomon.h" 7 #include "seccomon.h"
8 #include "secitem.h" 8 #include "secitem.h"
9 #include "secasn1.h" 9 #include "secasn1.h"
10 #include "secder.h" 10 #include "secder.h"
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 else { 465 else {
466 rid->responderIDType = responderIDType; 466 rid->responderIDType = responderIDType;
467 if (responderIDType == ocspResponderID_byName) { 467 if (responderIDType == ocspResponderID_byName) {
468 responderIDTemplate = ocsp_ResponderIDByNameTemplate; 468 responderIDTemplate = ocsp_ResponderIDByNameTemplate;
469 if (CERT_CopyName(tmpArena, &rid->responderIDValue.name, 469 if (CERT_CopyName(tmpArena, &rid->responderIDValue.name,
470 &responderCert->subject) != SECSuccess) 470 &responderCert->subject) != SECSuccess)
471 goto done; 471 goto done;
472 } 472 }
473 else { 473 else {
474 responderIDTemplate = ocsp_ResponderIDByKeyTemplate; 474 responderIDTemplate = ocsp_ResponderIDByKeyTemplate;
475 » if (!CERT_GetSPKIDigest(tmpArena, responderCert, SEC_OID_SHA1, 475 » if (!CERT_GetSubjectPublicKeyDigest(tmpArena, responderCert,
476 » » » » » &rid->responderIDValue.keyHash)) 476 » » » » SEC_OID_SHA1, &rid->responderIDValue.keyHash))
477 goto done; 477 goto done;
478 } 478 }
479 479
480 if (!SEC_ASN1EncodeItem(tmpArena, &rd->derResponderID, rid, 480 if (!SEC_ASN1EncodeItem(tmpArena, &rd->derResponderID, rid,
481 responderIDTemplate)) 481 responderIDTemplate))
482 goto done; 482 goto done;
483 483
484 br->tbsResponseData = rd; 484 br->tbsResponseData = rd;
485 485
486 if (!SEC_ASN1EncodeItem(tmpArena, &br->tbsResponseDataDER, br->tbsRespon seData, 486 if (!SEC_ASN1EncodeItem(tmpArena, &br->tbsResponseDataDER, br->tbsRespon seData,
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 response.statusValue)) 591 response.statusValue))
592 return NULL; 592 return NULL;
593 593
594 result = SEC_ASN1EncodeItem(arena, NULL, &response, 594 result = SEC_ASN1EncodeItem(arena, NULL, &response,
595 ocsp_OCSPErrorResponseTemplate); 595 ocsp_OCSPErrorResponseTemplate);
596 596
597 SECITEM_FreeItem(&response.responseStatus, PR_FALSE); 597 SECITEM_FreeItem(&response.responseStatus, PR_FALSE);
598 598
599 return result; 599 return result;
600 } 600 }
OLDNEW
« no previous file with comments | « nss/lib/certhigh/ocspi.h ('k') | nss/lib/ckfw/builtins/bfind.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698