encrypted-keys: add key format support

[pandora-kernel.git] / include / keys / encrypted-type.h

diff --git a/include/keys/encrypted-type.h b/include/keys/encrypted-type.h
index 9585501..1d45413 100644 (file)
--- a/include/keys/encrypted-type.h
+++ b/include/keys/encrypted-type.h
@@ -1,6 +1,11 @@
 /*
  * Copyright (C) 2010 IBM Corporation
- * Author: Mimi Zohar <zohar@us.ibm.com>
+ * Copyright (C) 2010 Politecnico di Torino, Italy
+ *                    TORSEC group -- http://security.polito.it
+ *
+ * Authors:
+ * Mimi Zohar <zohar@us.ibm.com>
+ * Roberto Sassu <roberto.sassu@polito.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,13 +20,17 @@
 
 struct encrypted_key_payload {
        struct rcu_head rcu;
+       char *format;           /* datablob: format */
        char *master_desc;      /* datablob: master key name */
        char *datalen;          /* datablob: decrypted key length */
        u8 *iv;                 /* datablob: iv */
        u8 *encrypted_data;     /* datablob: encrypted data */
        unsigned short datablob_len;    /* length of datablob */
        unsigned short decrypted_datalen;       /* decrypted data length */
-       u8 decrypted_data[0];   /* decrypted data +  datablob + hmac */
+       unsigned short payload_datalen;         /* payload data length */
+       unsigned short encrypted_key_format;    /* encrypted key format */
+       u8 *decrypted_data;     /* decrypted data */
+       u8 payload_data[0];     /* payload data + datablob + hmac */
 };
 
 extern struct key_type key_type_encrypted;