diff options
| author | nectar <nectar@FreeBSD.org> | 2003-02-19 23:24:16 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2003-02-19 23:24:16 +0000 |
| commit | 0fee824237555009e1c183a434436a50f306ecd7 (patch) | |
| tree | 2948ffd23bfeeecbdc69292dd5e77ea732e29795 /crypto/openssl/ssl | |
| parent | 21bb0e5fa958b55498782bb6040051bad9010e66 (diff) | |
| download | FreeBSD-src-0fee824237555009e1c183a434436a50f306ecd7.zip FreeBSD-src-0fee824237555009e1c183a434436a50f306ecd7.tar.gz | |
Resolve conflicts after import of OpenSSL 0.9.7a.
Diffstat (limited to 'crypto/openssl/ssl')
| -rw-r--r-- | crypto/openssl/ssl/s2_clnt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s2_clnt.c b/crypto/openssl/ssl/s2_clnt.c index c6319bb..1d24ded 100644 --- a/crypto/openssl/ssl/s2_clnt.c +++ b/crypto/openssl/ssl/s2_clnt.c @@ -1021,7 +1021,7 @@ static int get_server_finished(SSL *s) if (!(s->options & SSL_OP_MICROSOFT_SESS_ID_BUG)) { if ((s->session->session_id_length > sizeof s->session->session_id) - || (0 != memcmp(buf, s->session->session_id, + || (0 != memcmp(buf + 1, s->session->session_id, (unsigned int)s->session->session_id_length))) { ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR); |
