Source release 19.3.0

core/include/privacy_crypto.h

@@ -26,14 +26,15 @@
 
 #include <string>
 
-#include "disallow_copy_and_assign.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 namespace wvcdm {
 
 class AesCbcKey {
  public:
   AesCbcKey();
+  WVCDM_DISALLOW_COPY_AND_MOVE(AesCbcKey);
   ~AesCbcKey();
 
   bool Init(const std::string& key);
@@ -44,13 +45,12 @@ class AesCbcKey {
 
  private:
   std::string key_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(AesCbcKey);
-};
+};  // class AesCbcKey
 
 class RsaPublicKey {
  public:
   RsaPublicKey();
+  WVCDM_DISALLOW_COPY_AND_MOVE(RsaPublicKey);
   ~RsaPublicKey();
 
   // Initializes an RsaPublicKey object using a DER encoded PKCS#1 RSAPublicKey
@@ -67,9 +67,7 @@ class RsaPublicKey {
 
  private:
   std::string serialized_key_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(RsaPublicKey);
-};
+};  // class RsaPublicKey
 
 /**
  * Extracts an integer value from the extensions in a certificate.
@@ -88,7 +86,5 @@ std::string Md5Hash(const std::string& data);
 std::string Sha1Hash(const std::string& data);
 std::string Sha256Hash(const std::string& data);
 std::string Sha512Hash(const std::string& data);
-
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_PRIVACY_CRYPTO_H_