comparison libtomcrypt/src/encauth/gcm/gcm_done.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 gcm_done.c 13 @file gcm_done.c
14 GCM implementation, Terminate the stream, by Tom St Denis 14 GCM implementation, Terminate the stream, by Tom St Denis
60 gcm->X[x] ^= gcm->buf[x]; 60 gcm->X[x] ^= gcm->buf[x];
61 } 61 }
62 gcm_mult_h(gcm, gcm->X); 62 gcm_mult_h(gcm, gcm->X);
63 63
64 /* encrypt original counter */ 64 /* encrypt original counter */
65 cipher_descriptor[gcm->cipher].ecb_encrypt(gcm->Y_0, gcm->buf, &gcm->K); 65 if ((err = cipher_descriptor[gcm->cipher].ecb_encrypt(gcm->Y_0, gcm->buf, &gcm->K)) != CRYPT_OK) {
66 return err;
67 }
66 for (x = 0; x < 16 && x < *taglen; x++) { 68 for (x = 0; x < 16 && x < *taglen; x++) {
67 tag[x] = gcm->buf[x] ^ gcm->X[x]; 69 tag[x] = gcm->buf[x] ^ gcm->X[x];
68 } 70 }
69 *taglen = x; 71 *taglen = x;
70 72
75 77
76 #endif 78 #endif
77 79
78 80
79 /* $Source: /cvs/libtom/libtomcrypt/src/encauth/gcm/gcm_done.c,v $ */ 81 /* $Source: /cvs/libtom/libtomcrypt/src/encauth/gcm/gcm_done.c,v $ */
80 /* $Revision: 1.7 $ */ 82 /* $Revision: 1.9 $ */
81 /* $Date: 2005/05/05 14:35:58 $ */ 83 /* $Date: 2006/03/31 14:15:35 $ */