Attachment #343390 for bug #463444

View | Details | Raw Unified | Return to bug 463444
Collapse All | Expand All





				if (res!=SHA_CBLOCK) continue;

				/* j is not incremented yet */
				mask = 0-((inp_len+7-j)>>(sizeof(j)*8-1));
				data->u[SHA_LBLOCK-1] |= bitlen&mask;
				sha1_block_data_order(&key->md,data,1);
				mask &= 0-((j-inp_len-72)>>(sizeof(j)*8-1));
				pmac->u[0] |= key->md.h0 & mask;
				pmac->u[1] |= key->md.h1 & mask;
				pmac->u[2] |= key->md.h2 & mask;
- 

Return to bug 463444

Lines 328-337 static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX ctx, unsigned char out, Link Here

(-)a/crypto/evp/e_aes_cbc_hmac_sha1.c (-3 / +3 lines)
328		328
329	if (res!=SHA_CBLOCK) continue;	329	if (res!=SHA_CBLOCK) continue;
330		330
331	mask = 0-((inp_len+8-j)>>(sizeof(j)*8-1));	331	/* j is not incremented yet */
		332	mask = 0-((inp_len+7-j)>>(sizeof(j)*8-1));
332	data->u[SHA_LBLOCK-1] \|= bitlen&mask;	333	data->u[SHA_LBLOCK-1] \|= bitlen&mask;
333	sha1_block_data_order(&key->md,data,1);	334	sha1_block_data_order(&key->md,data,1);
334	mask &= 0-((j-inp_len-73)>>(sizeof(j)*8-1));	335	mask &= 0-((j-inp_len-72)>>(sizeof(j)*8-1));
335	pmac->u[0] \|= key->md.h0 & mask;	336	pmac->u[0] \|= key->md.h0 & mask;
336	pmac->u[1] \|= key->md.h1 & mask;	337	pmac->u[1] \|= key->md.h1 & mask;
337	pmac->u[2] \|= key->md.h2 & mask;	338	pmac->u[2] \|= key->md.h2 & mask;
338	-