diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-06 12:21:53 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-06 12:21:53 +0200 |
| commit | 29d34cdd24326b200a8fe3b4dc103cd7da0b134e (patch) | |
| tree | ffc45adb904e732b0856fe41dd6b8f8b73488cd9 /main/openssl/ssl/s3_srvr.c | |
| parent | 476917d00cbf44411cd8168e4a6d88e7453dd408 (diff) | |
merge ccs fix
Diffstat (limited to 'main/openssl/ssl/s3_srvr.c')
| -rw-r--r-- | main/openssl/ssl/s3_srvr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/openssl/ssl/s3_srvr.c b/main/openssl/ssl/s3_srvr.c index 0ee781f1..1976efa7 100644 --- a/main/openssl/ssl/s3_srvr.c +++ b/main/openssl/ssl/s3_srvr.c @@ -676,6 +676,7 @@ int ssl3_accept(SSL *s) case SSL3_ST_SR_CERT_VRFY_B: /* we should decide if we expected this one */ + s->s3->flags |= SSL3_FLAGS_CCS_OK; ret=ssl3_get_cert_verify(s); if (ret <= 0) goto end; @@ -693,6 +694,7 @@ int ssl3_accept(SSL *s) channel_id = s->s3->tlsext_channel_id_valid; #endif + s->s3->flags |= SSL3_FLAGS_CCS_OK; if (next_proto_neg) s->state=SSL3_ST_SR_NEXT_PROTO_A; else if (channel_id) |