Update pre9

2018-07-19 21:47:35 +09:00
parent 1914ae9055
commit 46f6b5e2fe
84 changed files with 2388 additions and 962 deletions
@@ -179,7 +179,9 @@ int ossl_statem_skip_early_data(SSL *s)
    if (s->ext.early_data != SSL_EARLY_DATA_REJECTED)
        return 0;

-    if (!s->server || s->statem.hand_state != TLS_ST_EARLY_DATA)
+    if (!s->server
+            || s->statem.hand_state != TLS_ST_EARLY_DATA
+            || s->hello_retry_request == SSL_HRR_COMPLETE)
        return 0;

    return 1;