Merge branch 'OpenSSL_1_0_2-stable' into agl-1.0.2aead

[oweals/openssl.git] / ssl / s3_pkt.c

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 3f0f9d31acdcd7bc302b2788b9b8de901661b76f..0cdf1dfb3ea3a5a31261d8a39235f657ad915f1f 100644 (file)
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -775,8 +775,11 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
                else
                        eivlen = 0;
                }
-       else if (s->aead_write_ctx != NULL)
+       else if (s->aead_write_ctx != NULL &&
+                s->aead_write_ctx->variable_nonce_included_in_record)
+               {
                eivlen = s->aead_write_ctx->variable_nonce_len;
+               }
        else
                eivlen = 0;