diff options
| author | David Howells <dhowells@redhat.com> | 2015-07-20 22:16:33 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2015-08-12 18:01:01 +0200 |
| commit | 60d65cacd7c2d84a6dcad69bcb57bbf0220c8643 (patch) | |
| tree | 636bda3cc9024a04edf1ae5780266fde743e7b1e /crypto/asymmetric_keys/pkcs7_parser.h | |
| parent | X.509: Change recorded SKID & AKID to not include Subject or Issuer (diff) | |
| download | linux-60d65cacd7c2d84a6dcad69bcb57bbf0220c8643.tar.xz linux-60d65cacd7c2d84a6dcad69bcb57bbf0220c8643.zip | |
PKCS#7: Support CMS messages also [RFC5652]
Since CMS is an evolution of PKCS#7, with much of the ASN.1 being
compatible, add support for CMS signed-data messages also [RFC5652 sec 5].
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-By: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'crypto/asymmetric_keys/pkcs7_parser.h')
| -rw-r--r-- | crypto/asymmetric_keys/pkcs7_parser.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_parser.h b/crypto/asymmetric_keys/pkcs7_parser.h index efc7dc9b8f9c..790dd7cec82c 100644 --- a/crypto/asymmetric_keys/pkcs7_parser.h +++ b/crypto/asymmetric_keys/pkcs7_parser.h @@ -33,7 +33,9 @@ struct pkcs7_signed_info { unsigned authattrs_len; const void *authattrs; - /* Issuing cert serial number and issuer's name */ + /* Issuing cert serial number and issuer's name [PKCS#7 or CMS ver 1] + * or issuing cert's SKID [CMS ver 3]. + */ struct asymmetric_key_id *signing_cert_id; /* Message signature. @@ -50,6 +52,7 @@ struct pkcs7_message { struct x509_certificate *certs; /* Certificate list */ struct x509_certificate *crl; /* Revocation list */ struct pkcs7_signed_info *signed_infos; + u8 version; /* Version of cert (1 -> PKCS#7 or CMS; 3 -> CMS) */ /* Content Data (or NULL) */ enum OID data_type; /* Type of Data */ |