Mercurial > dropbear
diff libtomcrypt/src/encauth/ocb/ocb_decrypt.c @ 415:8b9aba1d5fa4 channel-fix
merge of '73fe066c5d9e2395354ba74756124d45c978a04d'
and 'f5014cc84558f1e8eba42dbecf9f72f94bfe6134'
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 06 Feb 2007 16:00:18 +0000 |
| parents | 0cbe8f6dbf9e |
| children | f849a5ca2efc |
line wrap: on
line diff
--- a/libtomcrypt/src/encauth/ocb/ocb_decrypt.c Tue Feb 06 15:59:54 2007 +0000 +++ b/libtomcrypt/src/encauth/ocb/ocb_decrypt.c Tue Feb 06 16:00:18 2007 +0000 @@ -6,7 +6,7 @@ * The library is free for all purposes without any express * guarantee it works. * - * Tom St Denis, [email protected], http://libtomcrypt.org + * Tom St Denis, [email protected], http://libtomcrypt.com */ /** @@ -51,7 +51,9 @@ for (x = 0; x < ocb->block_len; x++) { tmp[x] = ct[x] ^ Z[x]; } - cipher_descriptor[ocb->cipher].ecb_decrypt(tmp, pt, &ocb->key); + if ((err = cipher_descriptor[ocb->cipher].ecb_decrypt(tmp, pt, &ocb->key)) != CRYPT_OK) { + return err; + } for (x = 0; x < ocb->block_len; x++) { pt[x] ^= Z[x]; } @@ -73,5 +75,5 @@ /* $Source: /cvs/libtom/libtomcrypt/src/encauth/ocb/ocb_decrypt.c,v $ */ -/* $Revision: 1.3 $ */ -/* $Date: 2005/05/05 14:35:58 $ */ +/* $Revision: 1.5 $ */ +/* $Date: 2006/03/31 14:15:35 $ */