| s2_enc.c (127134) | s2_enc.c (160817) |
|---|---|
| 1/* ssl/s2_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 * --- 86 unchanged lines hidden (view full) --- 95 96 num=c->key_len; 97 s->s2->key_material_length=num*2; 98 OPENSSL_assert(s->s2->key_material_length <= sizeof s->s2->key_material); 99 100 if (ssl2_generate_key_material(s) <= 0) 101 return 0; 102 | 1/* ssl/s2_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 * --- 86 unchanged lines hidden (view full) --- 95 96 num=c->key_len; 97 s->s2->key_material_length=num*2; 98 OPENSSL_assert(s->s2->key_material_length <= sizeof s->s2->key_material); 99 100 if (ssl2_generate_key_material(s) <= 0) 101 return 0; 102 |
| 103 OPENSSL_assert(c->iv_len <= sizeof s->session->key_arg); | 103 OPENSSL_assert(c->iv_len <= (int)sizeof(s->session->key_arg)); |
| 104 EVP_EncryptInit_ex(ws,c,NULL,&(s->s2->key_material[(client)?num:0]), 105 s->session->key_arg); 106 EVP_DecryptInit_ex(rs,c,NULL,&(s->s2->key_material[(client)?0:num]), 107 s->session->key_arg); 108 s->s2->read_key= &(s->s2->key_material[(client)?0:num]); 109 s->s2->write_key= &(s->s2->key_material[(client)?num:0]); 110 return(1); 111err: --- 80 unchanged lines hidden --- | 104 EVP_EncryptInit_ex(ws,c,NULL,&(s->s2->key_material[(client)?num:0]), 105 s->session->key_arg); 106 EVP_DecryptInit_ex(rs,c,NULL,&(s->s2->key_material[(client)?0:num]), 107 s->session->key_arg); 108 s->s2->read_key= &(s->s2->key_material[(client)?0:num]); 109 s->s2->write_key= &(s->s2->key_material[(client)?num:0]); 110 return(1); 111err: --- 80 unchanged lines hidden --- |