| s2_pkt.c (238405) | s2_pkt.c (246772) |
|---|---|
| 1/* ssl/s2_pkt.c */ 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 3 * All rights reserved. 4 * 5 * This package is an SSL implementation written 6 * by Eric Young (eay@cryptsoft.com). 7 * The implementation was written so as to conform with Netscapes SSL. 8 * --- 255 unchanged lines hidden (view full) --- 264 * encryption was not turned on yet due to an error */ 265 if ((!s->s2->clear_text) && 266 (s->s2->rlength >= (unsigned int)mac_size)) 267 { 268 ssl2_enc(s,0); 269 s->s2->ract_data_length-=mac_size; 270 ssl2_mac(s,mac,0); 271 s->s2->ract_data_length-=s->s2->padding; | 1/* ssl/s2_pkt.c */ 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 3 * All rights reserved. 4 * 5 * This package is an SSL implementation written 6 * by Eric Young (eay@cryptsoft.com). 7 * The implementation was written so as to conform with Netscapes SSL. 8 * --- 255 unchanged lines hidden (view full) --- 264 * encryption was not turned on yet due to an error */ 265 if ((!s->s2->clear_text) && 266 (s->s2->rlength >= (unsigned int)mac_size)) 267 { 268 ssl2_enc(s,0); 269 s->s2->ract_data_length-=mac_size; 270 ssl2_mac(s,mac,0); 271 s->s2->ract_data_length-=s->s2->padding; |
| 272 if ( (memcmp(mac,s->s2->mac_data, 273 (unsigned int)mac_size) != 0) || | 272 if ( (CRYPTO_memcmp(mac,s->s2->mac_data,mac_size) != 0) || |
| 274 (s->s2->rlength%EVP_CIPHER_CTX_block_size(s->enc_read_ctx) != 0)) 275 { 276 SSLerr(SSL_F_SSL2_READ_INTERNAL,SSL_R_BAD_MAC_DECODE); 277 return(-1); 278 } 279 } 280 INC32(s->s2->read_sequence); /* expect next number */ 281 /* s->s2->ract_data is now available for processing */ --- 463 unchanged lines hidden --- | 273 (s->s2->rlength%EVP_CIPHER_CTX_block_size(s->enc_read_ctx) != 0)) 274 { 275 SSLerr(SSL_F_SSL2_READ_INTERNAL,SSL_R_BAD_MAC_DECODE); 276 return(-1); 277 } 278 } 279 INC32(s->s2->read_sequence); /* expect next number */ 280 /* s->s2->ract_data is now available for processing */ --- 463 unchanged lines hidden --- |