X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fs3_clnt.c;h=74f5abe13c173781d5f6ff49c234677c128214cf;hb=8e3b2dbb31819b880886bfd275510c650ff264ea;hp=8141a5c6a14bf6e2ba4ace8402ecb2dafe4b7538;hpb=0e1dba934fa53e9736e9156b9e25bd1010290149;p=oweals%2Fopenssl.git diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 8141a5c6a1..74f5abe13c 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -295,7 +295,10 @@ int ssl3_connect(SSL *s) if (ret == 2) { s->hit = 1; - s->state=SSL3_ST_CR_FINISHED_A; + if (s->tlsext_ticket_expected) + s->state=SSL3_ST_CR_SESSION_TICKET_A; + else + s->state=SSL3_ST_CR_FINISHED_A; s->init_num=0; break; } @@ -1821,8 +1824,7 @@ err: int ssl3_get_cert_status(SSL *s) { int ok, al; - unsigned long resplen; - long n; + unsigned long resplen,n; const unsigned char *p; n=s->method->ssl_get_message(s, @@ -2656,7 +2658,7 @@ int ssl3_send_client_verify(SSL *s) { unsigned char signbuf[64]; int i; - size_t sigsize; + size_t sigsize=64; s->method->ssl3_enc->cert_verify_mac(s, NID_id_GostR3411_94, data);