Source release 19.3.0

oemcrypto/util/include/device_info_validator.h

@@ -7,12 +7,15 @@
 #ifndef WVOEC_UTIL_DEVICE_INFO_VALIDATOR_H_
 #define WVOEC_UTIL_DEVICE_INFO_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 {
@@ -21,12 +24,13 @@ namespace util {
 // https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:hardware/interfaces/security/rkp/aidl/android/hardware/security/keymint/DeviceInfoV3.cddl
 class DeviceInfoValidator : public CborValidator {
  public:
+  DeviceInfoValidator() = delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(DeviceInfoValidator);
+
   explicit DeviceInfoValidator(int version_number)
       : version_number_(version_number) {}
-  DeviceInfoValidator() = delete;
+
   virtual ~DeviceInfoValidator() override = default;
-  DeviceInfoValidator(const DeviceInfoValidator&) = delete;
-  DeviceInfoValidator& operator=(const DeviceInfoValidator&) = delete;
 
   // Decodes |device_info| and sets |message_status_|.
   virtual CborMessageStatus Parse(
@@ -48,7 +52,7 @@ class DeviceInfoValidator : public CborValidator {
   int version_number_;
   // Saved Cbor-encoded device info.
   std::vector<uint8_t> device_info_bytes_;
-};
+};  // class DeviceInfoValidator
 }  // namespace util
 }  // namespace wvoec
 #endif  // WVOEC_UTIL_DEVICE_INFO_VALIDATOR_H_