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

Side by Side Diff: openssl/crypto/cms/cms_ess.c

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: '' Created 8 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 | « openssl/crypto/cms/cms_err.c ('k') | openssl/crypto/cms/cms_io.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 /* crypto/cms/cms_ess.c */ 1 /* crypto/cms/cms_ess.c */
2 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
5 /* ==================================================================== 5 /* ====================================================================
6 * Copyright (c) 2008 The OpenSSL Project. All rights reserved. 6 * Copyright (c) 2008 The OpenSSL Project. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include <openssl/pem.h> 56 #include <openssl/pem.h>
57 #include <openssl/rand.h> 57 #include <openssl/rand.h>
58 #include <openssl/x509v3.h> 58 #include <openssl/x509v3.h>
59 #include <openssl/err.h> 59 #include <openssl/err.h>
60 #include <openssl/cms.h> 60 #include <openssl/cms.h>
61 #include "cms_lcl.h" 61 #include "cms_lcl.h"
62 62
63 DECLARE_ASN1_ITEM(CMS_ReceiptRequest) 63 DECLARE_ASN1_ITEM(CMS_ReceiptRequest)
64 DECLARE_ASN1_ITEM(CMS_Receipt) 64 DECLARE_ASN1_ITEM(CMS_Receipt)
65 65
66 IMPLEMENT_ASN1_FUNCTIONS_const(CMS_ReceiptRequest) 66 IMPLEMENT_ASN1_FUNCTIONS(CMS_ReceiptRequest)
67 67
68 /* ESS services: for now just Signed Receipt related */ 68 /* ESS services: for now just Signed Receipt related */
69 69
70 int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr) 70 int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr)
71 { 71 {
72 ASN1_STRING *str; 72 ASN1_STRING *str;
73 CMS_ReceiptRequest *rr = NULL; 73 CMS_ReceiptRequest *rr = NULL;
74 if (prr) 74 if (prr)
75 *prr = NULL; 75 *prr = NULL;
76 str = CMS_signed_get0_data_by_OBJ(si, 76 str = CMS_signed_get0_data_by_OBJ(si,
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 411
412 err: 412 err:
413 if (rr) 413 if (rr)
414 CMS_ReceiptRequest_free(rr); 414 CMS_ReceiptRequest_free(rr);
415 415
416 return os; 416 return os;
417 417
418 } 418 }
419 419
420 420
OLDNEW
« no previous file with comments | « openssl/crypto/cms/cms_err.c ('k') | openssl/crypto/cms/cms_io.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698