|
 |
c92cf8 |
diff -up openssl-fips-0.9.8e/ssl/ssl3.h.keying-mitm openssl-fips-0.9.8e/ssl/ssl3.h
|
|
|
c92cf8 |
--- openssl-fips-0.9.8e/ssl/ssl3.h.keying-mitm 2014-06-02 15:49:35.036283939 +0200
|
|
|
c92cf8 |
+++ openssl-fips-0.9.8e/ssl/ssl3.h 2014-06-02 17:00:09.808186361 +0200
|
|
|
c92cf8 |
@@ -344,6 +344,7 @@ typedef struct ssl3_buffer_st
|
|
|
c92cf8 |
* effected, but we can't prevent that.
|
|
|
c92cf8 |
*/
|
|
|
c92cf8 |
#define SSL3_FLAGS_SGC_RESTART_DONE 0x0040
|
|
|
c92cf8 |
+#define SSL3_FLAGS_CCS_OK 0x0080
|
|
|
c92cf8 |
|
|
|
c92cf8 |
typedef struct ssl3_state_st
|
|
|
c92cf8 |
{
|
|
|
c92cf8 |
diff -up openssl-fips-0.9.8e/ssl/s3_clnt.c.keying-mitm openssl-fips-0.9.8e/ssl/s3_clnt.c
|
|
|
c92cf8 |
--- openssl-fips-0.9.8e/ssl/s3_clnt.c.keying-mitm 2014-06-02 15:45:18.346349601 +0200
|
|
|
c92cf8 |
+++ openssl-fips-0.9.8e/ssl/s3_clnt.c 2014-06-02 15:49:35.036283939 +0200
|
|
|
c92cf8 |
@@ -425,6 +425,7 @@ int ssl3_connect(SSL *s)
|
|
|
c92cf8 |
case SSL3_ST_CR_FINISHED_A:
|
|
|
c92cf8 |
case SSL3_ST_CR_FINISHED_B:
|
|
|
c92cf8 |
|
|
|
c92cf8 |
+ s->s3->flags |= SSL3_FLAGS_CCS_OK;
|
|
|
c92cf8 |
ret=ssl3_get_finished(s,SSL3_ST_CR_FINISHED_A,
|
|
|
c92cf8 |
SSL3_ST_CR_FINISHED_B);
|
|
|
c92cf8 |
if (ret <= 0) goto end;
|
|
|
c92cf8 |
@@ -706,6 +707,7 @@ int ssl3_get_server_hello(SSL *s)
|
|
|
c92cf8 |
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
|
|
|
c92cf8 |
goto f_err;
|
|
|
c92cf8 |
}
|
|
|
c92cf8 |
+ s->s3->flags |= SSL3_FLAGS_CCS_OK;
|
|
|
c92cf8 |
s->hit=1;
|
|
|
c92cf8 |
}
|
|
|
c92cf8 |
else /* a miss or crap from the other end */
|
|
|
c92cf8 |
diff -up openssl-fips-0.9.8e/ssl/s3_pkt.c.keying-mitm openssl-fips-0.9.8e/ssl/s3_pkt.c
|
|
|
c92cf8 |
--- openssl-fips-0.9.8e/ssl/s3_pkt.c.keying-mitm 2014-06-02 15:45:18.375350271 +0200
|
|
|
c92cf8 |
+++ openssl-fips-0.9.8e/ssl/s3_pkt.c 2014-06-02 15:49:35.037283962 +0200
|
|
|
c92cf8 |
@@ -1133,6 +1133,15 @@ start:
|
|
|
c92cf8 |
goto f_err;
|
|
|
c92cf8 |
}
|
|
|
c92cf8 |
|
|
|
c92cf8 |
+ if (!(s->s3->flags & SSL3_FLAGS_CCS_OK))
|
|
|
c92cf8 |
+ {
|
|
|
c92cf8 |
+ al=SSL_AD_UNEXPECTED_MESSAGE;
|
|
|
c92cf8 |
+ SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_CCS_RECEIVED_EARLY);
|
|
|
c92cf8 |
+ goto f_err;
|
|
|
c92cf8 |
+ }
|
|
|
c92cf8 |
+
|
|
|
c92cf8 |
+ s->s3->flags &= ~SSL3_FLAGS_CCS_OK;
|
|
|
c92cf8 |
+
|
|
|
c92cf8 |
rr->length=0;
|
|
|
c92cf8 |
|
|
|
c92cf8 |
if (s->msg_callback)
|
|
|
c92cf8 |
@@ -1264,7 +1273,7 @@ int ssl3_do_change_cipher_spec(SSL *s)
|
|
|
c92cf8 |
|
|
|
c92cf8 |
if (s->s3->tmp.key_block == NULL)
|
|
|
c92cf8 |
{
|
|
|
c92cf8 |
- if (s->session == NULL)
|
|
|
c92cf8 |
+ if (s->session == NULL || s->session->master_key_length == 0)
|
|
|
c92cf8 |
{
|
|
|
c92cf8 |
/* might happen if dtls1_read_bytes() calls this */
|
|
|
c92cf8 |
SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC,SSL_R_CCS_RECEIVED_EARLY);
|
|
|
c92cf8 |
diff -up openssl-fips-0.9.8e/ssl/s3_srvr.c.keying-mitm openssl-fips-0.9.8e/ssl/s3_srvr.c
|
|
|
c92cf8 |
--- openssl-fips-0.9.8e/ssl/s3_srvr.c.keying-mitm 2014-06-02 15:45:18.362349971 +0200
|
|
|
c92cf8 |
+++ openssl-fips-0.9.8e/ssl/s3_srvr.c 2014-06-02 15:49:35.037283962 +0200
|
|
|
c92cf8 |
@@ -492,6 +492,7 @@ int ssl3_accept(SSL *s)
|
|
|
c92cf8 |
case SSL3_ST_SR_CERT_VRFY_A:
|
|
|
c92cf8 |
case SSL3_ST_SR_CERT_VRFY_B:
|
|
|
c92cf8 |
|
|
|
c92cf8 |
+ s->s3->flags |= SSL3_FLAGS_CCS_OK;
|
|
|
c92cf8 |
/* we should decide if we expected this one */
|
|
|
c92cf8 |
ret=ssl3_get_cert_verify(s);
|
|
|
c92cf8 |
if (ret <= 0) goto end;
|
|
|
c92cf8 |
@@ -502,6 +503,7 @@ int ssl3_accept(SSL *s)
|
|
|
c92cf8 |
|
|
|
c92cf8 |
case SSL3_ST_SR_FINISHED_A:
|
|
|
c92cf8 |
case SSL3_ST_SR_FINISHED_B:
|
|
|
c92cf8 |
+ s->s3->flags |= SSL3_FLAGS_CCS_OK;
|
|
|
c92cf8 |
ret=ssl3_get_finished(s,SSL3_ST_SR_FINISHED_A,
|
|
|
c92cf8 |
SSL3_ST_SR_FINISHED_B);
|
|
|
c92cf8 |
if (ret <= 0) goto end;
|