OEMCrypto v15.1 Updates

This CL updates documentation, reference code, and unit tests to match
the OEMCrypto v15.1 API.

1. The design for the Full Decrypt Path Testing application has
changed. Instead of reading hashes from an external file, it will use
a single key frame and modify it to match the desired size.  The test
application will then compute the hash and encrypt the frame.  For
OEMCrypto, this means that there will not be a call to
OEMCrypto_InitializeDecryptHash before the frame and
OEMCrypto_SetDecryptHash after the frame. Instead, there will be a
single call to OEMCrypto_SetDecryptHash before the frame. The function
OEMCrypto_InitializeDecryptHash will not be used.

2. The "Shared License" feature is not used by any production
server. This functionality is no longer required and OEMCrypto may
reject licenses with a nonzero bit 23 in the key control block.

util/include/file_store.h

@@ -8,35 +8,33 @@
 #define WVCDM_UTIL_FILE_STORE_H_
 
 #include <unistd.h>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "disallow_copy_and_assign.h"
+#include "util_common.h"
 
 namespace wvcdm {
 
 // File class. The implementation is platform dependent.
-class File {
+class CORE_UTIL_EXPORT File {
  public:
-  virtual ssize_t Read(char* buffer, size_t bytes);
-  virtual ssize_t Write(const char* buffer, size_t bytes);
-  virtual void Close();
-
- protected:
-  class Impl;
-
-  File(Impl*);
-  virtual ~File();
-
- private:
-  Impl* impl_;
+  File() {}
+  virtual ~File() {}
+  virtual ssize_t Read(char* buffer, size_t bytes) = 0;
+  virtual ssize_t Write(const char* buffer, size_t bytes) = 0;
 
   friend class FileSystem;
   CORE_DISALLOW_COPY_AND_ASSIGN(File);
 };
 
-class FileSystem {
+class CORE_UTIL_EXPORT FileSystem {
  public:
+  FileSystem();
+  FileSystem(const std::string& origin, void* extra_data);
+  virtual ~FileSystem();
+
   class Impl;
 
   // defines as bit flag
@@ -47,11 +45,7 @@ class FileSystem {
     kTruncate = 4
   };
 
-  FileSystem();
-  FileSystem(const std::string& origin, void* extra_data);
-  virtual ~FileSystem();
-
-  virtual File* Open(const std::string& file_path, int flags);
+  virtual std::unique_ptr<File> Open(const std::string& file_path, int flags);
 
   virtual bool Exists(const std::string& file_path);
   virtual bool Remove(const std::string& file_path);
@@ -63,14 +57,14 @@ class FileSystem {
                     std::vector<std::string>* names);
 
   const std::string& origin() const { return origin_; }
-  void SetOrigin(const std::string& origin);
+  void set_origin(const std::string& origin);
 
   const std::string& identifier() const { return identifier_; }
-  void SetIdentifier(const std::string& identifier);
+  void set_identifier(const std::string& identifier);
   bool IsGlobal() const { return identifier_.empty(); }
 
  private:
-  Impl* impl_;
+  std::unique_ptr<FileSystem::Impl> impl_;
   std::string origin_;
   std::string identifier_;
 

util/include/log.h

@@ -7,6 +7,8 @@
 #ifndef WVCDM_UTIL_LOG_H_
 #define WVCDM_UTIL_LOG_H_
 
+#include "util_common.h"
+
 namespace wvcdm {
 
 // Simple logging class. The implementation is platform dependent.
@@ -25,10 +27,11 @@ extern LogPriority g_cutoff;
 // This function is supplied for cases where the system layer does not
 // initialize logging.  This is also needed to initialize logging in
 // unit tests.
-void InitLogging();
+CORE_UTIL_EXPORT void InitLogging();
 
-void Log(const char* file, const char* function, int line, LogPriority level,
-         const char* fmt, ...);
+CORE_UTIL_EXPORT void Log(
+    const char* file, const char* function, int line, LogPriority level,
+    const char* fmt, ...);
 
 // Log APIs
 #ifndef LOGE

util/include/string_conversions.h

@@ -10,23 +10,31 @@
 #include <string>
 #include <vector>
 
+#include "util_common.h"
+
 namespace wvcdm {
 
-std::vector<uint8_t> a2b_hex(const std::string& b);
-std::vector<uint8_t> a2b_hex(const std::string& label, const std::string& b);
-std::string a2bs_hex(const std::string& b);
-std::string b2a_hex(const std::vector<uint8_t>& b);
-std::string b2a_hex(const std::string& b);
-std::string Base64Encode(const std::vector<uint8_t>& bin_input);
-std::vector<uint8_t> Base64Decode(const std::string& bin_input);
-std::string Base64SafeEncode(const std::vector<uint8_t>& bin_input);
-std::string Base64SafeEncodeNoPad(const std::vector<uint8_t>& bin_input);
-std::vector<uint8_t> Base64SafeDecode(const std::string& bin_input);
-std::string HexEncode(const uint8_t* bytes, unsigned size);
-std::string IntToString(int value);
-int64_t htonll64(int64_t x);
-inline int64_t ntohll64(int64_t x) { return htonll64(x); }
-std::string BytesToString(const uint8_t* bytes, unsigned size);
+CORE_UTIL_EXPORT std::vector<uint8_t> a2b_hex(const std::string& b);
+CORE_UTIL_EXPORT std::vector<uint8_t> a2b_hex(const std::string& label,
+                                              const std::string& b);
+CORE_UTIL_EXPORT std::string a2bs_hex(const std::string& b);
+CORE_UTIL_EXPORT std::string b2a_hex(const std::vector<uint8_t>& b);
+CORE_UTIL_EXPORT std::string b2a_hex(const std::string& b);
+CORE_UTIL_EXPORT std::string Base64Encode(
+    const std::vector<uint8_t>& bin_input);
+CORE_UTIL_EXPORT std::vector<uint8_t> Base64Decode(
+    const std::string& bin_input);
+CORE_UTIL_EXPORT std::string Base64SafeEncode(
+    const std::vector<uint8_t>& bin_input);
+CORE_UTIL_EXPORT std::string Base64SafeEncodeNoPad(
+    const std::vector<uint8_t>& bin_input);
+CORE_UTIL_EXPORT std::vector<uint8_t> Base64SafeDecode(
+    const std::string& bin_input);
+CORE_UTIL_EXPORT std::string HexEncode(const uint8_t* bytes, unsigned size);
+CORE_UTIL_EXPORT std::string IntToString(int value);
+CORE_UTIL_EXPORT int64_t htonll64(int64_t x);
+CORE_UTIL_EXPORT inline int64_t ntohll64(int64_t x) { return htonll64(x); }
+CORE_UTIL_EXPORT std::string BytesToString(const uint8_t* bytes, unsigned size);
 
 }  // namespace wvcdm
 

util/include/util_common.h

@@ -0,0 +1,22 @@
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
+
+#ifndef WVCDM_UTIL_UTIL_COMMON_H_
+#define WVCDM_UTIL_UTIL_COMMON_H_
+
+#ifdef _WIN32
+# ifdef CORE_UTIL_IMPLEMENTATION
+#  define CORE_UTIL_EXPORT __declspec(dllexport)
+# else
+#  define CORE_UTIL_EXPORT __declspec(dllimport)
+# endif
+#else
+# ifdef CORE_UTIL_IMPLEMENTATION
+#  define CORE_UTIL_EXPORT __attribute__((visibility("default")))
+# else
+#  define CORE_UTIL_EXPORT
+# endif
+#endif
+
+#endif  // WVCDM_UTIL_UTIL_COMMON_H_