Revert "[youtube] improved decrypt_signature, closes #1060"

This reverts commit fe6fad1242 and closes #1066.
pull/8/head
Philipp Hagemeister 11 years ago
parent bf85454116
commit be547e1d3b

@ -179,24 +179,25 @@ class YoutubeIE(InfoExtractor):
def _decrypt_signature(self, s): def _decrypt_signature(self, s):
"""Turn the encrypted s field into a working signature""" """Turn the encrypted s field into a working signature"""
def voodoo(a, b): if len(s) == 88:
c = a[0]; return s[48] + s[81:67:-1] + s[82] + s[66:62:-1] + s[85] + s[61:48:-1] + s[67] + s[47:12:-1] + s[3] + s[11:3:-1] + s[2] + s[12]
a[0] = a[b % len(a)]; elif len(s) == 87:
a[b] = c; return s[62] + s[82:62:-1] + s[83] + s[61:52:-1] + s[0] + s[51:2:-1]
return a; elif len(s) == 86:
return s[2:63] + s[82] + s[64:82] + s[63]
s = list(s) elif len(s) == 85:
s = s[2:len(s)]; return s[76] + s[82:76:-1] + s[83] + s[75:60:-1] + s[0] + s[59:50:-1] + s[1] + s[49:2:-1]
s = s[::-1]; elif len(s) == 84:
s = s[3:len(s)]; return s[83:36:-1] + s[2] + s[35:26:-1] + s[3] + s[25:3:-1] + s[26]
s = voodoo(s, 9); elif len(s) == 83:
s = s[3:len(s)]; return s[6] + s[3:6] + s[33] + s[7:24] + s[0] + s[25:33] + s[53] + s[34:53] + s[24] + s[54:]
s = voodoo(s, 43); elif len(s) == 82:
s = s[3:len(s)]; return s[36] + s[79:67:-1] + s[81] + s[66:40:-1] + s[33] + s[39:36:-1] + s[40] + s[35] + s[0] + s[67] + s[32:0:-1] + s[34]
s = s[::-1]; elif len(s) == 81:
s = voodoo(s, 23); return s[6] + s[3:6] + s[33] + s[7:24] + s[0] + s[25:33] + s[2] + s[34:53] + s[24] + s[54:81]
s = "".join(s);
return s; else:
raise ExtractorError(u'Unable to decrypt signature, key length %d not supported; retrying might work' % (len(s)))
def _get_available_subtitles(self, video_id): def _get_available_subtitles(self, video_id):
self.report_video_subtitles_download(video_id) self.report_video_subtitles_download(video_id)

Loading…
Cancel
Save