comparison libtomcrypt/src/encauth/ocb/s_ocb_done.c @ 382:0cbe8f6dbf9e

propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) to branch 'au.asn.ucc.matt.dropbear' (head 02c413252c90e9de8e03d91e9939dde3029f5c0a)
author Matt Johnston <matt@ucc.asn.au>
date Thu, 11 Jan 2007 02:41:05 +0000
parents 1b9e69c058d2
children f849a5ca2efc
comparison
equal deleted inserted replaced
379:b66a00272a90 382:0cbe8f6dbf9e
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 s_ocb_done.c 13 @file s_ocb_done.c
14 OCB implementation, internal helper, by Tom St Denis 14 OCB implementation, internal helper, by Tom St Denis
82 for (x = 0; x < ocb->block_len; x++) { 82 for (x = 0; x < ocb->block_len; x++) {
83 X[x] ^= ocb->Lr[x]; 83 X[x] ^= ocb->Lr[x];
84 } 84 }
85 85
86 /* Y[m] = E(X[m])) */ 86 /* Y[m] = E(X[m])) */
87 cipher_descriptor[ocb->cipher].ecb_encrypt(X, Y, &ocb->key); 87 if ((err = cipher_descriptor[ocb->cipher].ecb_encrypt(X, Y, &ocb->key)) != CRYPT_OK) {
88 goto error;
89 }
88 90
89 if (mode == 1) { 91 if (mode == 1) {
90 /* decrypt mode, so let's xor it first */ 92 /* decrypt mode, so let's xor it first */
91 /* xor C[m] into checksum */ 93 /* xor C[m] into checksum */
92 for (x = 0; x < (int)ptlen; x++) { 94 for (x = 0; x < (int)ptlen; x++) {
111 for (x = 0; x < ocb->block_len; x++) { 113 for (x = 0; x < ocb->block_len; x++) {
112 ocb->checksum[x] ^= Y[x] ^ Z[x]; 114 ocb->checksum[x] ^= Y[x] ^ Z[x];
113 } 115 }
114 116
115 /* encrypt checksum, er... tag!! */ 117 /* encrypt checksum, er... tag!! */
116 cipher_descriptor[ocb->cipher].ecb_encrypt(ocb->checksum, X, &ocb->key); 118 if ((err = cipher_descriptor[ocb->cipher].ecb_encrypt(ocb->checksum, X, &ocb->key)) != CRYPT_OK) {
119 goto error;
120 }
117 cipher_descriptor[ocb->cipher].done(&ocb->key); 121 cipher_descriptor[ocb->cipher].done(&ocb->key);
118 122
119 /* now store it */ 123 /* now store it */
120 for (x = 0; x < ocb->block_len && x < (int)*taglen; x++) { 124 for (x = 0; x < ocb->block_len && x < (int)*taglen; x++) {
121 tag[x] = X[x]; 125 tag[x] = X[x];
126 zeromem(X, MAXBLOCKSIZE); 130 zeromem(X, MAXBLOCKSIZE);
127 zeromem(Y, MAXBLOCKSIZE); 131 zeromem(Y, MAXBLOCKSIZE);
128 zeromem(Z, MAXBLOCKSIZE); 132 zeromem(Z, MAXBLOCKSIZE);
129 zeromem(ocb, sizeof(*ocb)); 133 zeromem(ocb, sizeof(*ocb));
130 #endif 134 #endif
131 135 error:
132 XFREE(X); 136 XFREE(X);
133 XFREE(Y); 137 XFREE(Y);
134 XFREE(Z); 138 XFREE(Z);
135 139
136 return CRYPT_OK; 140 return err;
137 } 141 }
138 142
139 #endif 143 #endif
140 144
141 145
142 /* $Source: /cvs/libtom/libtomcrypt/src/encauth/ocb/s_ocb_done.c,v $ */ 146 /* $Source: /cvs/libtom/libtomcrypt/src/encauth/ocb/s_ocb_done.c,v $ */
143 /* $Revision: 1.4 $ */ 147 /* $Revision: 1.6 $ */
144 /* $Date: 2005/05/05 14:35:58 $ */ 148 /* $Date: 2006/03/31 14:15:35 $ */