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

Side by Side Diff: openssl/crypto/cms/cms_lcl.h

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_io.c ('k') | openssl/crypto/cms/cms_lib.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_lcl.h */ 1 /* crypto/cms/cms_lcl.h */
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 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 #endif 399 #endif
400 400
401 struct CMS_Receipt_st 401 struct CMS_Receipt_st
402 { 402 {
403 long version; 403 long version;
404 ASN1_OBJECT *contentType; 404 ASN1_OBJECT *contentType;
405 ASN1_OCTET_STRING *signedContentIdentifier; 405 ASN1_OCTET_STRING *signedContentIdentifier;
406 ASN1_OCTET_STRING *originatorSignatureValue; 406 ASN1_OCTET_STRING *originatorSignatureValue;
407 }; 407 };
408 408
409 DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo)
409 DECLARE_ASN1_ITEM(CMS_SignerInfo) 410 DECLARE_ASN1_ITEM(CMS_SignerInfo)
410 DECLARE_ASN1_ITEM(CMS_IssuerAndSerialNumber) 411 DECLARE_ASN1_ITEM(CMS_IssuerAndSerialNumber)
411 DECLARE_ASN1_ITEM(CMS_Attributes_Sign) 412 DECLARE_ASN1_ITEM(CMS_Attributes_Sign)
412 DECLARE_ASN1_ITEM(CMS_Attributes_Verify) 413 DECLARE_ASN1_ITEM(CMS_Attributes_Verify)
413 DECLARE_ASN1_ALLOC_FUNCTIONS(CMS_IssuerAndSerialNumber) 414 DECLARE_ASN1_ALLOC_FUNCTIONS(CMS_IssuerAndSerialNumber)
414 415
415 #define CMS_SIGNERINFO_ISSUER_SERIAL 0 416 #define CMS_SIGNERINFO_ISSUER_SERIAL 0
416 #define CMS_SIGNERINFO_KEYIDENTIFIER 1 417 #define CMS_SIGNERINFO_KEYIDENTIFIER 1
417 418
418 #define CMS_RECIPINFO_ISSUER_SERIAL 0 419 #define CMS_RECIPINFO_ISSUER_SERIAL 0
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 int cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms); 452 int cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms);
452 int cms_msgSigDigest_add1(CMS_SignerInfo *dest, CMS_SignerInfo *src); 453 int cms_msgSigDigest_add1(CMS_SignerInfo *dest, CMS_SignerInfo *src);
453 ASN1_OCTET_STRING *cms_encode_Receipt(CMS_SignerInfo *si); 454 ASN1_OCTET_STRING *cms_encode_Receipt(CMS_SignerInfo *si);
454 455
455 BIO *cms_EnvelopedData_init_bio(CMS_ContentInfo *cms); 456 BIO *cms_EnvelopedData_init_bio(CMS_ContentInfo *cms);
456 457
457 #ifdef __cplusplus 458 #ifdef __cplusplus
458 } 459 }
459 #endif 460 #endif
460 #endif 461 #endif
OLDNEW
« no previous file with comments | « openssl/crypto/cms/cms_io.c ('k') | openssl/crypto/cms/cms_lib.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698