Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next
[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-vuplus / enigma2 / enigma2-plugins / enigma2_plugins_mytube_vuplus.patch
1 diff --git a/mytube/src/plugin.py b/mytube/src/plugin.py
2 index 8f9c71d..4420fe2 100755
3 --- a/mytube/src/plugin.py
4 +++ b/mytube/src/plugin.py
5 @@ -386,8 +386,10 @@ class MyTubePlayerMainScreen(Screen, ConfigListScreen):
6                 if current[1].help_window.instance is not None:
7                         current[1].help_window.instance.hide()
8  
9 -               l3cert = etpm.getCert(eTPM.TPMD_DT_LEVEL3_CERT)
10 -               if l3cert is None or l3cert is "":
11 +#              l3cert = etpm.getCert(eTPM.TPMD_DT_LEVEL3_CERT)
12 +#              if l3cert is None or l3cert is "":
13 +               l3cert = 0
14 +               if False:
15                         self["videoactions"].setEnabled(False)
16                         self["searchactions"].setEnabled(False)
17                         self["config_actions"].setEnabled(False)
18 @@ -400,7 +402,8 @@ class MyTubePlayerMainScreen(Screen, ConfigListScreen):
19                         self['feedlist'].setList(self.statuslist)
20                         return
21  
22 -               self.l3key = validate_cert(l3cert, self.l2key)
23 +#              self.l3key = validate_cert(l3cert, self.l2key)
24 +               self.l3key = 0
25                 if self.l3key is None:
26                         print "l3cert invalid"
27                         return
28 @@ -409,11 +412,12 @@ class MyTubePlayerMainScreen(Screen, ConfigListScreen):
29                         print "random error"
30                         return
31  
32 -               val = etpm.challenge(rnd)
33 -               result = decrypt_block(val, self.l3key)
34 +#              val = etpm.challenge(rnd)
35 +#              result = decrypt_block(val, self.l3key)
36  
37                 self.statuslist = []
38 -               if result[80:88] == rnd:
39 +#              if result[80:88] == rnd:
40 +               if True:
41                         self.statuslist.append(( _("Fetching feed entries"), _("Trying to download the Youtube feed entries. Please wait..." ) ))
42                         self["feedlist"].style = "state"
43                         self['feedlist'].setList(self.statuslist)
44 @@ -457,9 +461,10 @@ class MyTubePlayerMainScreen(Screen, ConfigListScreen):
45                                 rnd = get_rnd()
46                                 if rnd is None:
47                                         return
48 -                               val = etpm.challenge(rnd)
49 -                               result = decrypt_block(val, self.l3key)
50 -                       if not result or result[80:88] != rnd:
51 +#                              val = etpm.challenge(rnd)
52 +#                              result = decrypt_block(val, self.l3key)
53 +#                      if not result or result[80:88] != rnd:
54 +                       if False:
55                                 self["key_green"].show()
56                                 self.statuslist.append(( _("Genuine Dreambox validation failed!"), _("Verify your Dreambox authenticity by running the genuine dreambox plugin!" ) ))
57                                 self["feedlist"].style = "state"
58 @@ -1776,12 +1781,14 @@ class MyTubePlayer(Screen, InfoBarNotifications):
59  
60  def MyTubeMain(session, **kwargs):
61         l2 = False
62 -       l2cert = etpm.getCert(eTPM.TPMD_DT_LEVEL2_CERT)
63 +#      l2cert = etpm.getCert(eTPM.TPMD_DT_LEVEL2_CERT)
64 +       l2cert = 0
65         if l2cert is None:
66                 print "l2cert not found"
67                 return
68         
69 -       l2key = validate_cert(l2cert, rootkey)
70 +#      l2key = validate_cert(l2cert, rootkey)
71 +       l2key = 0
72         if l2key is None:
73                 print "l2cert invalid"
74                 return