diff options
author | Mikko Herranen <mh1@iki.fi> | 2007-11-26 09:12:07 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2008-01-10 16:16:23 -0500 |
commit | e3a4ea4fd2e5f154ae9233f1ce30e7564e5cbcfc (patch) | |
tree | 8564aa42c333db6170cdc5dfc93e7a82bc315b27 /crypto/tcrypt.h | |
parent | ff85a8082f0665fe6f79d50eb79bdccb98cabfa2 (diff) |
[CRYPTO] tcrypt: Add aead support
Add AEAD support to tcrypt, needed by GCM.
Signed-off-by: Mikko Herranen <mh1@iki.fi>
Reviewed-by: Mika Kukkonen <mika.kukkonen@nsn.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/tcrypt.h')
-rw-r--r-- | crypto/tcrypt.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h index 6ffc411bf464..865196a648a0 100644 --- a/crypto/tcrypt.h +++ b/crypto/tcrypt.h | |||
@@ -6,12 +6,14 @@ | |||
6 | * | 6 | * |
7 | * Copyright (c) 2002 James Morris <jmorris@intercode.com.au> | 7 | * Copyright (c) 2002 James Morris <jmorris@intercode.com.au> |
8 | * Copyright (c) 2002 Jean-Francois Dive <jef@linuxbe.org> | 8 | * Copyright (c) 2002 Jean-Francois Dive <jef@linuxbe.org> |
9 | * Copyright (c) 2007 Nokia Siemens Networks | ||
9 | * | 10 | * |
10 | * This program is free software; you can redistribute it and/or modify it | 11 | * This program is free software; you can redistribute it and/or modify it |
11 | * under the terms of the GNU General Public License as published by the Free | 12 | * under the terms of the GNU General Public License as published by the Free |
12 | * Software Foundation; either version 2 of the License, or (at your option) | 13 | * Software Foundation; either version 2 of the License, or (at your option) |
13 | * any later version. | 14 | * any later version. |
14 | * | 15 | * |
16 | * 2007-11-13 Added AEAD support | ||
15 | * 2006-12-07 Added SHA384 HMAC and SHA512 HMAC tests | 17 | * 2006-12-07 Added SHA384 HMAC and SHA512 HMAC tests |
16 | * 2004-08-09 Cipher speed tests by Reyk Floeter <reyk@vantronix.net> | 18 | * 2004-08-09 Cipher speed tests by Reyk Floeter <reyk@vantronix.net> |
17 | * 2003-09-14 Changes by Kartikey Mahendra Bhatt | 19 | * 2003-09-14 Changes by Kartikey Mahendra Bhatt |
@@ -51,6 +53,26 @@ struct cipher_testvec { | |||
51 | unsigned short rlen; | 53 | unsigned short rlen; |
52 | }; | 54 | }; |
53 | 55 | ||
56 | struct aead_testvec { | ||
57 | char key[MAX_KEYLEN] __attribute__ ((__aligned__(4))); | ||
58 | char iv[MAX_IVLEN]; | ||
59 | char input[512]; | ||
60 | char assoc[512]; | ||
61 | char result[512]; | ||
62 | char tag[128]; | ||
63 | unsigned char tap[MAX_TAP]; | ||
64 | unsigned char atap[MAX_TAP]; | ||
65 | int np; | ||
66 | int anp; | ||
67 | unsigned char fail; | ||
68 | unsigned char wk; /* weak key flag */ | ||
69 | unsigned char klen; | ||
70 | unsigned short ilen; | ||
71 | unsigned short alen; | ||
72 | unsigned short rlen; | ||
73 | unsigned short tlen; | ||
74 | }; | ||
75 | |||
54 | struct cipher_speed { | 76 | struct cipher_speed { |
55 | unsigned char klen; | 77 | unsigned char klen; |
56 | unsigned int blen; | 78 | unsigned int blen; |