From 3a4f4cde9fa880aaaea8f44002d57223fb32228a Mon Sep 17 00:00:00 2001
From: hai007 <hais@google.com>
Date: Tue, 5 Dec 2023 07:47:26 -0800
Subject: [PATCH] Avoid manually forward declaring BoringSSL types

Per go/cstyle#Forward_Declarations. BoringSSL already provides a forward declarations header. Also tidy up the source file's includes. It seems to only use symbols in aead.h.

PiperOrigin-RevId: 588069592
---
 internal/crypto_cros/aead.cc | 3 +--
 internal/crypto_cros/aead.h  | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/internal/crypto_cros/aead.cc b/internal/crypto_cros/aead.cc
index 7e0868f9..98bc66c4 100644
--- a/internal/crypto_cros/aead.cc
+++ b/internal/crypto_cros/aead.cc
@@ -32,8 +32,7 @@
 #include "absl/types/span.h"
 #include "internal/crypto_cros/nearby_base.h"
 #include "internal/crypto_cros/openssl_util.h"
-#include <openssl/aes.h>
-#include <openssl/evp.h>
+#include <openssl/aead.h>
 
 namespace crypto {
 
diff --git a/internal/crypto_cros/aead.h b/internal/crypto_cros/aead.h
index fca3ac91..12da8a57 100644
--- a/internal/crypto_cros/aead.h
+++ b/internal/crypto_cros/aead.h
@@ -26,8 +26,7 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "internal/crypto_cros/crypto_export.h"
-
-struct evp_aead_st;
+#include <openssl/base.h>
 
 namespace crypto {
 
@@ -87,7 +86,7 @@ class CRYPTO_EXPORT Aead {
             size_t* output_length, size_t max_output_length) const;
 
   absl::optional<absl::Span<const uint8_t>> key_;
-  const evp_aead_st* aead_;
+  const EVP_AEAD* aead_;
 };
 
 }  // namespace crypto