summaryrefslogtreecommitdiff
path: root/main/openssl/ssl/s3_clnt.c
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-06-06 12:21:53 +0200
committerArne Schwabe <arne@rfc2549.org>2014-06-06 12:21:53 +0200
commit29d34cdd24326b200a8fe3b4dc103cd7da0b134e (patch)
treeffc45adb904e732b0856fe41dd6b8f8b73488cd9 /main/openssl/ssl/s3_clnt.c
parent476917d00cbf44411cd8168e4a6d88e7453dd408 (diff)
merge ccs fix
Diffstat (limited to 'main/openssl/ssl/s3_clnt.c')
-rw-r--r--main/openssl/ssl/s3_clnt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/openssl/ssl/s3_clnt.c b/main/openssl/ssl/s3_clnt.c
index b65b12d9..5e15b75c 100644
--- a/main/openssl/ssl/s3_clnt.c
+++ b/main/openssl/ssl/s3_clnt.c
@@ -607,7 +607,7 @@ int ssl3_connect(SSL *s)
case SSL3_ST_CR_FINISHED_A:
case SSL3_ST_CR_FINISHED_B:
-
+ s->s3->flags |= SSL3_FLAGS_CCS_OK;
ret=ssl3_get_finished(s,SSL3_ST_CR_FINISHED_A,
SSL3_ST_CR_FINISHED_B);
if (ret <= 0) goto end;
@@ -988,6 +988,7 @@ int ssl3_get_server_hello(SSL *s)
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
goto f_err;
}
+ s->s3->flags |= SSL3_FLAGS_CCS_OK;
s->hit=1;
}
else /* a miss or crap from the other end */