diff options
| author | nectar <nectar@FreeBSD.org> | 2002-08-10 01:50:50 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2002-08-10 01:50:50 +0000 |
| commit | f779e835e5d8cb858cdc744d7757adf40b0fe8d7 (patch) | |
| tree | f25f0f96f62ebd270fd809a712de75e582438254 /crypto/openssl/ssl/s2_enc.c | |
| parent | fdead658fba11f58ea41c31b8ef1c69d56657079 (diff) | |
| download | FreeBSD-src-f779e835e5d8cb858cdc744d7757adf40b0fe8d7.zip FreeBSD-src-f779e835e5d8cb858cdc744d7757adf40b0fe8d7.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssl/ssl/s2_enc.c')
| -rw-r--r-- | crypto/openssl/ssl/s2_enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s2_enc.c b/crypto/openssl/ssl/s2_enc.c index 69e5997..3917efb 100644 --- a/crypto/openssl/ssl/s2_enc.c +++ b/crypto/openssl/ssl/s2_enc.c @@ -98,7 +98,8 @@ int ssl2_enc_init(SSL *s, int client) num=c->key_len; s->s2->key_material_length=num*2; - ssl2_generate_key_material(s); + if (ssl2_generate_key_material(s) <= 0) + return 0; EVP_EncryptInit(ws,c,&(s->s2->key_material[(client)?num:0]), s->session->key_arg); |
