diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2007-01-11 02:22:00 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2007-01-11 02:22:00 +0000 |
| commit | f3b834d5366011e1e4b340c7acdbd582c7e50689 (patch) | |
| tree | 599db815e7486c0666dc981cd26066d074a5c80a /src/mac/pmac/pmac_done.c | |
| parent | c57e1d8def6e38d350da8b098a91806d405e952e (diff) | |
Update to LibTomCrypt 1.16
--HG--
branch : libtomcrypt-orig
extra : convert_revision : 52840647ac7f5c707c3bd158d119a15734a7ef28
Diffstat (limited to 'src/mac/pmac/pmac_done.c')
| -rw-r--r-- | src/mac/pmac/pmac_done.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mac/pmac/pmac_done.c b/src/mac/pmac/pmac_done.c index 09c430c..005f94f 100644 --- a/src/mac/pmac/pmac_done.c +++ b/src/mac/pmac/pmac_done.c @@ -6,7 +6,7 @@ * The library is free for all purposes without any express * guarantee it works. * - * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org + * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.com */ #include "tomcrypt.h" @@ -15,7 +15,7 @@ PMAC implementation, terminate a session, by Tom St Denis */ -#ifdef PMAC +#ifdef LTC_PMAC int pmac_done(pmac_state *state, unsigned char *out, unsigned long *outlen) { @@ -49,11 +49,13 @@ int pmac_done(pmac_state *state, unsigned char *out, unsigned long *outlen) } /* encrypt it */ - cipher_descriptor[state->cipher_idx].ecb_encrypt(state->checksum, state->checksum, &state->key); + if ((err = cipher_descriptor[state->cipher_idx].ecb_encrypt(state->checksum, state->checksum, &state->key)) != CRYPT_OK) { + return err; + } cipher_descriptor[state->cipher_idx].done(&state->key); /* store it */ - for (x = 0; x < state->block_len && x <= (int)*outlen; x++) { + for (x = 0; x < state->block_len && x < (int)*outlen; x++) { out[x] = state->checksum[x]; } *outlen = x; @@ -68,5 +70,5 @@ int pmac_done(pmac_state *state, unsigned char *out, unsigned long *outlen) /* $Source: /cvs/libtom/libtomcrypt/src/mac/pmac/pmac_done.c,v $ */ -/* $Revision: 1.4 $ */ -/* $Date: 2005/05/05 14:35:59 $ */ +/* $Revision: 1.8 $ */ +/* $Date: 2006/11/03 00:39:49 $ */ |