Merge tag 'dlm-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[firefly-linux-kernel-4.4.55.git] / crypto / asymmetric_keys / x509_parser.h

diff --git a/crypto/asymmetric_keys/x509_parser.h b/crypto/asymmetric_keys/x509_parser.h
index dcdb5c94f5148b7dc9b0dc3723e36519d26c2404..1de01eaec88490c6c24d669a6f02c6b4fc2e9959 100644 (file)
--- a/crypto/asymmetric_keys/x509_parser.h
+++ b/crypto/asymmetric_keys/x509_parser.h
@@ -23,8 +23,8 @@ struct x509_certificate {
        struct asymmetric_key_id *skid;         /* Subject + subjectKeyId (optional) */
        struct asymmetric_key_id *akid_id;      /* CA AuthKeyId matching ->id (optional) */
        struct asymmetric_key_id *akid_skid;    /* CA AuthKeyId matching ->skid (optional) */
-       struct tm       valid_from;
-       struct tm       valid_to;
+       time64_t        valid_from;
+       time64_t        valid_to;
        const void      *tbs;                   /* Signed data */
        unsigned        tbs_size;               /* Size of signed data */
        unsigned        raw_sig_size;           /* Size of sigature */
@@ -49,6 +49,9 @@ struct x509_certificate {
  */
 extern void x509_free_certificate(struct x509_certificate *cert);
 extern struct x509_certificate *x509_cert_parse(const void *data, size_t datalen);
+extern int x509_decode_time(time64_t *_t,  size_t hdrlen,
+                           unsigned char tag,
+                           const unsigned char *value, size_t vlen);
 
 /*
  * x509_public_key.c