summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2010-08-26 14:54:16 +0000
committerBodo Möller <bodo@openssl.org>2010-08-26 14:54:16 +0000
commitf16176dab409c8de444315ba00c4eff36dd0e063 (patch)
tree885b3db8263349f879dc2857351ddfe50ec980ec /ssl
parent76af94eb271ea4ab373645839512f5f3d22dcaac (diff)
Patch from PR #1833 was broken: there's no s->s3->new_session
(only s->new_session).
Diffstat (limited to 'ssl')
-rw-r--r--ssl/s3_lib.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index c6d4ac19a0..da2ed9ee75 100644
--- a/ssl/s3_lib.c
+++ b/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);
}
-