comparison 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
comparison
equal deleted inserted replaced
414:c53a26c430e5 415:8b9aba1d5fa4
4 * algorithms in a highly modular and flexible manner. 4 * algorithms in a highly modular and flexible manner.
5 * 5 *
6 * The library is free for all purposes without any express 6 * The library is free for all purposes without any express
7 * guarantee it works. 7 * guarantee it works.
8 * 8 *
9 * Tom St Denis, [email protected], http://libtomcrypt.org 9 * Tom St Denis, [email protected], http://libtomcrypt.com
10 */ 10 */
11 11
12 /** 12 /**
13 @file ocb_decrypt.c 13 @file ocb_decrypt.c
14 OCB implementation, decrypt data, by Tom St Denis 14 OCB implementation, decrypt data, by Tom St Denis
49 49
50 /* xor ct in, encrypt, xor Z out */ 50 /* xor ct in, encrypt, xor Z out */
51 for (x = 0; x < ocb->block_len; x++) { 51 for (x = 0; x < ocb->block_len; x++) {
52 tmp[x] = ct[x] ^ Z[x]; 52 tmp[x] = ct[x] ^ Z[x];
53 } 53 }
54 cipher_descriptor[ocb->cipher].ecb_decrypt(tmp, pt, &ocb->key); 54 if ((err = cipher_descriptor[ocb->cipher].ecb_decrypt(tmp, pt, &ocb->key)) != CRYPT_OK) {
55 return err;
56 }
55 for (x = 0; x < ocb->block_len; x++) { 57 for (x = 0; x < ocb->block_len; x++) {
56 pt[x] ^= Z[x]; 58 pt[x] ^= Z[x];
57 } 59 }
58 60
59 /* compute checksum */ 61 /* compute checksum */
71 73
72 #endif 74 #endif
73 75
74 76
75 /* $Source: /cvs/libtom/libtomcrypt/src/encauth/ocb/ocb_decrypt.c,v $ */ 77 /* $Source: /cvs/libtom/libtomcrypt/src/encauth/ocb/ocb_decrypt.c,v $ */
76 /* $Revision: 1.3 $ */ 78 /* $Revision: 1.5 $ */
77 /* $Date: 2005/05/05 14:35:58 $ */ 79 /* $Date: 2006/03/31 14:15:35 $ */