Ticket #12486: hls-aes-decode.patch

mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp

@@ -1294 +1294 @@
 
 #ifdef USING_LIBCRYPTO
     /* If the segment is encrypted, decode it */
-    if (segment.HasKeyPath())
+    if (hls->HasKeyPath())
     {
         if (!hls->DecodeData(downloader, hls->IVLoaded() ? hls->AESIV() : NULL,
-                             segment.KeyPath(),
-                             buffer, segment.Sequence()));
-        return 0;
+                             hls->KeyPath(),
+                             buffer, segment.Sequence()))
+        {
+            return 0;
+        }
     }
 #endif
 

mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h

@@ -32 +32 @@
 #ifdef USING_LIBCRYPTO
     bool DownloadKey(void);
     bool DecodeData(const uint8_t *IV, QByteArray& data);
-    bool HasKeyPath(void) const { return !m_psz_key_path.isEmpty(); }
-    QString KeyPath(void) const { return m_psz_key_path; }
-    void SetKeyPath(const QString path) { m_psz_key_path = path; }
+    //bool HasKeyPath(void) const { return !m_psz_key_path.isEmpty(); }
+    //QString KeyPath(void) const { return m_psz_key_path; }
+    //void SetKeyPath(const QString path) { m_psz_key_path = path; }
 #endif
 
   protected:

mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp

@@ -80 +80 @@
 {
     AESKeyMap::iterator Ikey;
 
-    if ((Ikey = m_aeskeys.find(keypath)) == m_aeskeys.end())
+    if (!m_aeskeys.contains(keypath))
     {
         AES_KEY* key = new AES_KEY;
         DownloadKey(downloader, keypath, key);

mythtv/libs/libmythtv/recorders/HLS/HLSStream.h

@@ -69 +69 @@
 
     uint8_t *AESIV(void) { return m_AESIV; }
     void SetKeyPath(const QString x) { m_keypath = x; }
+    bool HasKeyPath(void) const { return !m_keypath.isEmpty(); }
+    QString KeyPath(void) const { return m_keypath; }
+
 #endif // USING_LIBCRYPTO
 
   protected: