diff options
| author | simon <simon@FreeBSD.org> | 2007-03-15 20:07:27 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2007-03-15 20:07:27 +0000 |
| commit | 394ba190a3f3c2ec13e67e830b6faeb2dd3e651c (patch) | |
| tree | d788253de8c917bbf6257b56dbda264342f8095e /crypto/openssl/ssl/s23_srvr.c | |
| parent | 699a8581f98495705b6c4fa8f75d5b9e815d63aa (diff) | |
| download | FreeBSD-src-394ba190a3f3c2ec13e67e830b6faeb2dd3e651c.zip FreeBSD-src-394ba190a3f3c2ec13e67e830b6faeb2dd3e651c.tar.gz | |
Resolve conflicts after import of OpenSSL 0.9.8e.
Diffstat (limited to 'crypto/openssl/ssl/s23_srvr.c')
| -rw-r--r-- | crypto/openssl/ssl/s23_srvr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s23_srvr.c b/crypto/openssl/ssl/s23_srvr.c index da4f377..6637bb95 100644 --- a/crypto/openssl/ssl/s23_srvr.c +++ b/crypto/openssl/ssl/s23_srvr.c @@ -565,7 +565,6 @@ int ssl23_get_client_hello(SSL *s) s->init_num=0; if (buf != buf_space) OPENSSL_free(buf); - s->first_packet=1; return(SSL_accept(s)); err: if (buf != buf_space) OPENSSL_free(buf); |
