Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / s390 / crypto / zcrypt_cex2a.h

diff --git a/drivers/s390/crypto/zcrypt_cex2a.h b/drivers/s390/crypto/zcrypt_cex2a.h
index 8f69d1dacab8a06dcadedde5142f7a5733b35f96..0350665810cf53032c9e172210887b5f480b73c2 100644 (file)
--- a/drivers/s390/crypto/zcrypt_cex2a.h
+++ b/drivers/s390/crypto/zcrypt_cex2a.h
@@ -51,8 +51,10 @@ struct type50_hdr {
 
 #define TYPE50_MEB1_FMT                0x0001
 #define TYPE50_MEB2_FMT                0x0002
+#define TYPE50_MEB3_FMT                0x0003
 #define TYPE50_CRB1_FMT                0x0011
 #define TYPE50_CRB2_FMT                0x0012
+#define TYPE50_CRB3_FMT                0x0013
 
 /* Mod-Exp, with a small modulus */
 struct type50_meb1_msg {
@@ -74,6 +76,16 @@ struct type50_meb2_msg {
        unsigned char   message[256];
 } __attribute__((packed));
 
+/* Mod-Exp, with a larger modulus */
+struct type50_meb3_msg {
+       struct type50_hdr header;
+       unsigned short  keyblock_type;  /* 0x0003 */
+       unsigned char   reserved[6];
+       unsigned char   exponent[512];
+       unsigned char   modulus[512];
+       unsigned char   message[512];
+} __attribute__((packed));
+
 /* CRT, with a small modulus */
 struct type50_crb1_msg {
        struct type50_hdr header;
@@ -100,6 +112,19 @@ struct type50_crb2_msg {
        unsigned char   message[256];
 } __attribute__((packed));
 
+/* CRT, with a larger modulus */
+struct type50_crb3_msg {
+       struct type50_hdr header;
+       unsigned short  keyblock_type;  /* 0x0013 */
+       unsigned char   reserved[6];
+       unsigned char   p[256];
+       unsigned char   q[256];
+       unsigned char   dp[256];
+       unsigned char   dq[256];
+       unsigned char   u[256];
+       unsigned char   message[512];
+} __attribute__((packed));
+
 /**
  * The type 80 response family is associated with a CEX2A card.
  *