| s3_enc.c (194206) | s3_enc.c (215697) |
|---|---|
| 1/* ssl/s3_enc.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 * --- 177 unchanged lines hidden (view full) --- 186 OPENSSL_cleanse(smd,SHA_DIGEST_LENGTH); 187 EVP_MD_CTX_cleanup(&m5); 188 EVP_MD_CTX_cleanup(&s1); 189 return 1; 190 } 191 192int ssl3_change_cipher_state(SSL *s, int which) 193 { | 1/* ssl/s3_enc.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 * --- 177 unchanged lines hidden (view full) --- 186 OPENSSL_cleanse(smd,SHA_DIGEST_LENGTH); 187 EVP_MD_CTX_cleanup(&m5); 188 EVP_MD_CTX_cleanup(&s1); 189 return 1; 190 } 191 192int ssl3_change_cipher_state(SSL *s, int which) 193 { |
| 194 unsigned char *p,*key_block,*mac_secret; | 194 unsigned char *p,*mac_secret; |
| 195 unsigned char exp_key[EVP_MAX_KEY_LENGTH]; 196 unsigned char exp_iv[EVP_MAX_IV_LENGTH]; 197 unsigned char *ms,*key,*iv,*er1,*er2; 198 EVP_CIPHER_CTX *dd; 199 const EVP_CIPHER *c; 200#ifndef OPENSSL_NO_COMP 201 COMP_METHOD *comp; 202#endif --- 6 unchanged lines hidden (view full) --- 209 c=s->s3->tmp.new_sym_enc; 210 m=s->s3->tmp.new_hash; 211#ifndef OPENSSL_NO_COMP 212 if (s->s3->tmp.new_compression == NULL) 213 comp=NULL; 214 else 215 comp=s->s3->tmp.new_compression->method; 216#endif | 195 unsigned char exp_key[EVP_MAX_KEY_LENGTH]; 196 unsigned char exp_iv[EVP_MAX_IV_LENGTH]; 197 unsigned char *ms,*key,*iv,*er1,*er2; 198 EVP_CIPHER_CTX *dd; 199 const EVP_CIPHER *c; 200#ifndef OPENSSL_NO_COMP 201 COMP_METHOD *comp; 202#endif --- 6 unchanged lines hidden (view full) --- 209 c=s->s3->tmp.new_sym_enc; 210 m=s->s3->tmp.new_hash; 211#ifndef OPENSSL_NO_COMP 212 if (s->s3->tmp.new_compression == NULL) 213 comp=NULL; 214 else 215 comp=s->s3->tmp.new_compression->method; 216#endif |
| 217 key_block=s->s3->tmp.key_block; | |
| 218 219 if (which & SSL3_CC_READ) 220 { 221 if (s->enc_read_ctx != NULL) 222 reuse_dd = 1; 223 else if ((s->enc_read_ctx=OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL) 224 goto err; 225 else --- 499 unchanged lines hidden --- | 217 218 if (which & SSL3_CC_READ) 219 { 220 if (s->enc_read_ctx != NULL) 221 reuse_dd = 1; 222 else if ((s->enc_read_ctx=OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL) 223 goto err; 224 else --- 499 unchanged lines hidden --- |