Remove SSL 3.0 implementation. Update-Note: SSL_CTX_set_min_proto_version(SSL3_VERSION) now fails. SSL_OP_NO_SSLv3 is now zero. Internal SSL3-specific "AEAD"s are gone. Change-Id: I34edb160be40a5eea3e2e0fdea562c6e2adda229 Reviewed-on: https://boringssl-review.googlesource.com/29444 Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/ssl_aead_ctx.cc b/ssl/ssl_aead_ctx.cc index 363c959..322b1b5 100644 --- a/ssl/ssl_aead_ctx.cc +++ b/ssl/ssl_aead_ctx.cc
@@ -42,7 +42,6 @@ random_variable_nonce_(false), xor_fixed_nonce_(false), omit_length_in_ad_(false), - omit_version_in_ad_(false), omit_ad_(false), ad_is_header_(false) { OPENSSL_memset(fixed_nonce_, 0, sizeof(fixed_nonce_)); @@ -147,7 +146,6 @@ aead_ctx->variable_nonce_included_in_record_ = true; aead_ctx->random_variable_nonce_ = true; aead_ctx->omit_length_in_ad_ = true; - aead_ctx->omit_version_in_ad_ = (protocol_version == SSL3_VERSION); } return aead_ctx; @@ -235,10 +233,8 @@ OPENSSL_memcpy(storage, seqnum, 8); size_t len = 8; storage[len++] = type; - if (!omit_version_in_ad_) { - storage[len++] = static_cast<uint8_t>((record_version >> 8)); - storage[len++] = static_cast<uint8_t>(record_version); - } + storage[len++] = static_cast<uint8_t>((record_version >> 8)); + storage[len++] = static_cast<uint8_t>(record_version); if (!omit_length_in_ad_) { storage[len++] = static_cast<uint8_t>((plaintext_len >> 8)); storage[len++] = static_cast<uint8_t>(plaintext_len);