mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
Patch from PR #1833 was broken: there's no s->s3->new_session
(only s->new_session).
This commit is contained in:
parent
76af94eb27
commit
f16176dab4
12
ssl/s3_lib.c
12
ssl/s3_lib.c
@ -2226,7 +2226,6 @@ void ssl3_clear(SSL *s)
|
||||
|
||||
s->packet_length=0;
|
||||
s->s3->renegotiate=0;
|
||||
s->s3->new_session=0;
|
||||
s->s3->total_renegotiations=0;
|
||||
s->s3->num_renegotiations=0;
|
||||
s->s3->in_read_app_data=0;
|
||||
@ -2545,6 +2544,11 @@ long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)(void))
|
||||
unsigned char *, int, void *))fp;
|
||||
break;
|
||||
#endif
|
||||
case SSL_CTRL_SET_NOT_RESUMABLE_SESS_CB:
|
||||
{
|
||||
s->not_resumable_session_cb = (int (*)(SSL *, int))fp;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@ -2789,6 +2793,11 @@ long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
|
||||
break;
|
||||
|
||||
#endif
|
||||
case SSL_CTRL_SET_NOT_RESUMABLE_SESS_CB:
|
||||
{
|
||||
ctx->not_resumable_session_cb = (int (*)(SSL *, int))fp;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return(0);
|
||||
}
|
||||
@ -3336,4 +3345,3 @@ need to go to SSL_ST_ACCEPT.
|
||||
}
|
||||
return(ret);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user