fixup

Author: npaun

include/ncrypto.h

@@ -262,8 +262,8 @@ class ECKeyPointer;
 class Dsa;
 class Rsa;
 class Ec;
-class AEAD;
-class AEADCtxPointer;
+class Aead;
+class AeadCtxPointer;
 
 struct StackOfXASN1Deleter {
   void operator()(STACK_OF(ASN1_OBJECT) * p) const {
@@ -1755,25 +1755,25 @@ class KEM final {
 
 // ============================================================================
 // AEAD (Authenticated Encryption with Associated Data)
-// Note that AEAD primitives are accessed through the Cipher class instead, if
-// using OpenSSL.
+// Note that the underlying EVP_AEAD interface is specific to BoringSSL. AEAD
+// primitives are accessed through the Cipher class instead, if using OpenSSL.
 
 #ifdef OPENSSL_IS_BORINGSSL
-class AEAD final : public ModeMixin<AEAD> {
+class Aead final : public ModeMixin<Aead> {
  private:
   // BoringSSL does not keep a list of AEADs, so we need to maintain our own.
-  struct AEADInfo {
+  struct AeadInfo {
     std::string name;
     int mode;
     int nid = 0;  // Note: BoringSSL only defines NIDs for some AEADs
   };
 
  public:
-  AEAD() = default;
-  AEAD(const AEADInfo* info, const EVP_AEAD* aead) : info_(info), aead_(aead) {}
-  AEAD(const AEAD&) = default;
-  AEAD& operator=(const AEAD&) = default;
-  NCRYPTO_DISALLOW_MOVE(AEAD)
+  Aead() = default;
+  Aead(const AeadInfo* info, const EVP_AEAD* aead) : info_(info), aead_(aead) {}
+  Aead(const Aead&) = default;
+  Aead& operator=(const Aead&) = default;
+  NCRYPTO_DISALLOW_MOVE(Aead)
 
   inline const EVP_AEAD* get() const { return aead_; }
   inline operator const EVP_AEAD*() const { return aead_; }
@@ -1787,59 +1787,59 @@ class AEAD final : public ModeMixin<AEAD> {
   int getMaxTagLength() const;
   std::string_view getName() const;
 
-  static const AEAD FromName(const char* name);
+  static const Aead FromName(std::string_view name);
 
   // TODO(npaun): BoringSSL does not define NIDs for all AEADs.
   // Decide if we will even implement this method.
   // int getNid() const;
   // static const AEAD FromNid(int nid);
 
-  static const AEAD FromCtx(std::string_view name, const AEADCtxPointer& ctx);
+  static const Aead FromCtx(std::string_view name, const AeadCtxPointer& ctx);
 
   // Utilities to get various AEADs by type.
 
-  static const AEAD EMPTY;
-  static const AEAD AES_128_GCM;
-  static const AEAD AES_192_GCM;
-  static const AEAD AES_256_GCM;
-  static const AEAD CHACHA20_POLY1305;
-  static const AEAD XCHACHA20_POLY1305;
-  static const AEAD AES_128_CTR_HMAC_SHA256;
-  static const AEAD AES_256_CTR_HMAC_SHA256;
-  static const AEAD AES_128_GCM_SIV;
-  static const AEAD AES_256_GCM_SIV;
-  static const AEAD AES_128_GCM_RANDNONCE;
-  static const AEAD AES_256_GCM_RANDNONCE;
-  static const AEAD AES_128_CCM_BLUETOOTH;
-  static const AEAD AES_128_CCM_BLUETOOTH_8;
-  static const AEAD AES_128_CCM_MATTER;
-  // static const AEAD AES_128_EAX;
-  // static const AEAD AES_256_EAX;
+  static const Aead EMPTY;
+  static const Aead AES_128_GCM;
+  static const Aead AES_192_GCM;
+  static const Aead AES_256_GCM;
+  static const Aead CHACHA20_POLY1305;
+  static const Aead XCHACHA20_POLY1305;
+  static const Aead AES_128_CTR_HMAC_SHA256;
+  static const Aead AES_256_CTR_HMAC_SHA256;
+  static const Aead AES_128_GCM_SIV;
+  static const Aead AES_256_GCM_SIV;
+  static const Aead AES_128_GCM_RANDNONCE;
+  static const Aead AES_256_GCM_RANDNONCE;
+  static const Aead AES_128_CCM_BLUETOOTH;
+  static const Aead AES_128_CCM_BLUETOOTH_8;
+  static const Aead AES_128_CCM_MATTER;
+  static const Aead AES_128_EAX;
+  static const Aead AES_256_EAX;
 
  private:
   const EVP_AEAD* aead_ = nullptr;
-  const AEADInfo* info_ = nullptr;
+  const AeadInfo* info_ = nullptr;
 
-  using AEADConstructor = const EVP_AEAD* (*)();
-  static const std::unordered_map<AEADConstructor, AEADInfo> aeadIndex;
-  static const AEAD FromConstructor(AEADConstructor construct);
+  using AeadConstructor = const EVP_AEAD* (*)();
+  static const std::unordered_map<AeadConstructor, AeadInfo> aeadIndex;
+  static const Aead FromConstructor(AeadConstructor construct);
 };
 
-class AEADCtxPointer final {
+class AeadCtxPointer final {
  public:
-  static AEADCtxPointer New(
-      const AEAD& aead,
+  static AeadCtxPointer New(
+      const Aead& aead,
       bool encrypt,
       const unsigned char* key = nullptr,
       size_t keyLen = 0,
       size_t tagLen = EVP_AEAD_DEFAULT_TAG_LENGTH /* = 0 */);
 
-  AEADCtxPointer() = default;
-  explicit AEADCtxPointer(EVP_AEAD_CTX* ctx);
-  AEADCtxPointer(AEADCtxPointer&& other) noexcept;
-  AEADCtxPointer& operator=(AEADCtxPointer&& other) noexcept;
-  NCRYPTO_DISALLOW_COPY(AEADCtxPointer)
-  ~AEADCtxPointer();
+  AeadCtxPointer() = default;
+  explicit AeadCtxPointer(EVP_AEAD_CTX* ctx);
+  AeadCtxPointer(AeadCtxPointer&& other) noexcept;
+  AeadCtxPointer& operator=(AeadCtxPointer&& other) noexcept;
+  NCRYPTO_DISALLOW_COPY(AeadCtxPointer)
+  ~AeadCtxPointer();
 
   inline bool operator==(std::nullptr_t) const noexcept {
     return ctx_ == nullptr;
@@ -1850,7 +1850,7 @@ class AEADCtxPointer final {
   void reset(EVP_AEAD_CTX* ctx = nullptr);
   EVP_AEAD_CTX* release();
 
-  bool init(const AEAD& aead,
+  bool init(const Aead& aead,
             bool encrypt,
             const unsigned char* key = nullptr,
             size_t keyLen = 0,