summaryrefslogtreecommitdiffstats
path: root/crypto/modes/ccm128.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-04-18 13:15:37 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-04-18 13:15:37 +0000
commit6386b1b34d955178ff8bf6fe5247667ff63a5dee (patch)
tree3eba261737e6b791608ec7b637002ea6503d042d /crypto/modes/ccm128.c
parent3b4a855778462b17c6bcfa1a8552731a808125c6 (diff)
Compile ccm128.c, move some structures to modes_lcl.h add prototypes.
Diffstat (limited to 'crypto/modes/ccm128.c')
-rw-r--r--crypto/modes/ccm128.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/crypto/modes/ccm128.c b/crypto/modes/ccm128.c
index 7cae1af95b..943b8bab91 100644
--- a/crypto/modes/ccm128.c
+++ b/crypto/modes/ccm128.c
@@ -58,13 +58,6 @@
#endif
#include <assert.h>
-typedef struct {
- union { u64 u[2]; u8 c[16]; } nonce, cmac;
- u64 blocks;
- block128_f block;
- void *key;
-} CCM128_CONTEXT;
-
/* First you setup M and L parameters and pass the key schedule */
void CRYPTO_ccm128_init(CCM128_CONTEXT *ctx,
unsigned int M,unsigned int L,void *key,block128_f block)
@@ -251,7 +244,7 @@ int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
size_t n;
unsigned int i,L;
unsigned char flags0 = ctx->nonce.c[0];
- block128_f block;
+ block128_f block = ctx->block;
union { u64 u[2]; u8 c[16]; } scratch;
if (!(flags0&0x40))