Source release 19.3.0

oemcrypto/util/include/bcc_validator.h

@@ -7,12 +7,15 @@
 #ifndef WVOEC_UTIL_BCC_VALIDATOR_H_
 #define WVOEC_UTIL_BCC_VALIDATOR_H_
 
+#include <inttypes.h>
+
 #include <sstream>
 #include <string>
 #include <vector>
 
 #include "cbor_validator.h"
 #include "cppbor.h"
+#include "wv_class_utils.h"
 
 namespace wvoec {
 namespace util {
@@ -45,10 +48,10 @@ struct BccPublicKeyInfo {
 // Google Dice Profile: go/dice-profile
 class BccValidator : public CborValidator {
  public:
-  explicit BccValidator() {}
+  BccValidator() = default;
   virtual ~BccValidator() override = default;
-  BccValidator(const BccValidator&) = delete;
-  BccValidator& operator=(const BccValidator&) = delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(BccValidator);
+
   // Verifies the Cbor struct of a client generated root of trust. This message
   // is part of an attestation model conforming to the Google Open Dice Profile.
   // This message is received from a client device to attest it is a valid
@@ -75,7 +78,7 @@ class BccValidator : public CborValidator {
                        const std::vector<uint8_t>& signature);
   // Used to generate formatted message.
   std::stringstream msg_ss_;
-};
+};  // class BccValidator
 }  // namespace util
 }  // namespace wvoec
 #endif  // WVOEC_UTIL_BCC_VALIDATOR_H_