diff options
| author | kris <kris@FreeBSD.org> | 2002-01-27 03:17:13 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2002-01-27 03:17:13 +0000 |
| commit | 7b695f1ddd82d490cdda720d8f2582d974e68402 (patch) | |
| tree | 8b8666bb4e0a4b9c1b9cb968fd73db474c9521a6 /crypto/openssl/ssl/s23_clnt.c | |
| parent | 0b3d98771f14f56f6b501527f0c5de53c5fe7483 (diff) | |
| download | FreeBSD-src-7b695f1ddd82d490cdda720d8f2582d974e68402.zip FreeBSD-src-7b695f1ddd82d490cdda720d8f2582d974e68402.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssl/ssl/s23_clnt.c')
| -rw-r--r-- | crypto/openssl/ssl/s23_clnt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s23_clnt.c b/crypto/openssl/ssl/s23_clnt.c index 8a3daaf..4a7aff5 100644 --- a/crypto/openssl/ssl/s23_clnt.c +++ b/crypto/openssl/ssl/s23_clnt.c @@ -115,8 +115,8 @@ int ssl23_connect(SSL *s) else if (s->ctx->info_callback != NULL) cb=s->ctx->info_callback; - if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); s->in_handshake++; + if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); for (;;) { |
