Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/yowsup/layers/protocol_media/mediauploader.py b/yowsup/layers/protocol_media/mediauploader.py
- index da9b3d1..e2ea835 100644
- --- a/yowsup/layers/protocol_media/mediauploader.py
- +++ b/yowsup/layers/protocol_media/mediauploader.py
- @@ -5,6 +5,18 @@ from time import sleep
- import threading
- import logging
- from yowsup.common.tools import MimeTools
- +from axolotl.kdf.hkdfv3 import HKDFv3
- +import binascii
- +from axolotl.util.byteutil import ByteUtil
- +import Crypto.Cipher.AES as AES
- +from axolotl.ecc.curve import Curve
- +from axolotl.sessionbuilder import SessionBuilder
- +from axolotl.state.sessionstate import SessionState
- +from axolotl.protocol.whispermessage import WhisperMessage
- +from axolotl.protocol.prekeywhispermessage import PreKeyWhisperMessage
- +from axolotl.nosessionexception import NoSessionException
- +from axolotl.invalidmessageexception import InvalidMessageException
- +from axolotl.duplicatemessagexception import DuplicateMessageException
- logger = logging.getLogger(__name__)
- @@ -29,6 +41,20 @@ class MediaUploader(WARequest, threading.Thread):
- self.sock = socket.socket()
- + def pad(self, s):
- + return s + ((16-len(s) % 16) * '{')
- +
- + def encryptImg(self, img):
- + refkey = binascii.hexlify(os.urandom(112))
- + img = self.pad(img)
- + derivative = HKDFv3().deriveSecrets(binascii.unhexlify(refkey), binascii.unhexlify("576861747341707020496d616765204b657973"), 112)
- + parts = ByteUtil.split(derivative, 16, 32)
- + iv = parts[0]
- + cipherKey = parts[1]
- + cipher = AES.new(key=cipherKey, mode=AES.MODE_CBC, IV=iv)
- + imgEnc=cipher.encrypt(img)
- + return imgEnc[:-6]
- +
- def start(self):
- if self.async:
- threading.Thread.__init__(self)
- @@ -89,7 +115,8 @@ class MediaUploader(WARequest, threading.Thread):
- totalsent = 0
- buf = 1024
- f = open(sourcePath, 'rb')
- - stream = f.read()
- + stream1 = f.read()
- + stream = self.encryptImg(stream1)
- f.close()
- status = 0
- lastEmit = 0
- diff --git a/yowsup/layers/protocol_media/protocolentities/iq_requestupload.py b/yowsup/layers/protocol_media/protocolentities/iq_requestupload.py
- index bdd1e69..7a2a1a8 100644
- --- a/yowsup/layers/protocol_media/protocolentities/iq_requestupload.py
- +++ b/yowsup/layers/protocol_media/protocolentities/iq_requestupload.py
- @@ -62,7 +62,7 @@ class RequestUploadIqProtocolEntity(IqProtocolEntity):
- }
- if self.origHash:
- attribs["orighash"] = self.origHash
- - mediaNode = ProtocolTreeNode("media", attribs)
- + mediaNode = ProtocolTreeNode("encr_media", attribs)
- node.addChild(mediaNode)
- return node
- @@ -71,7 +71,7 @@ class RequestUploadIqProtocolEntity(IqProtocolEntity):
- assert node.getAttributeValue("type") == "set", "Expected set as iq type in request upload, got %s" % node.getAttributeValue("type")
- entity = IqProtocolEntity.fromProtocolTreeNode(node)
- entity.__class__ = RequestUploadIqProtocolEntity
- - mediaNode = node.getChild("media")
- + mediaNode = node.getChild("encr_media")
- entity.setRequestArguments(
- mediaNode.getAttributeValue("type"),
- mediaNode.getAttributeValue("hash"),
- diff --git a/yowsup/layers/protocol_media/protocolentities/iq_requestupload_result.py b/yowsup/layers/protocol_media/protocolentities/iq_requestupload_result.py
- index 45e7eb8..2ca58c4 100644
- --- a/yowsup/layers/protocol_media/protocolentities/iq_requestupload_result.py
- +++ b/yowsup/layers/protocol_media/protocolentities/iq_requestupload_result.py
- @@ -35,7 +35,7 @@ class ResultRequestUploadIqProtocolEntity(ResultIqProtocolEntity):
- node = super(ResultRequestUploadIqProtocolEntity, self).toProtocolTreeNode()
- if not self.isDuplicate():
- - mediaNode = ProtocolTreeNode("media", {"url": self.url})
- + mediaNode = ProtocolTreeNode("encr_media", {"url": self.url})
- if self.ip:
- mediaNode["ip"] = self.ip
- @@ -51,7 +51,7 @@ class ResultRequestUploadIqProtocolEntity(ResultIqProtocolEntity):
- def fromProtocolTreeNode(node):
- entity= ResultIqProtocolEntity.fromProtocolTreeNode(node)
- entity.__class__ = ResultRequestUploadIqProtocolEntity
- - mediaNode = node.getChild("media")
- + mediaNode = node.getChild("encr_media")
- if mediaNode:
- entity.setUploadProps(mediaNode["url"], mediaNode["ip"], mediaNode["resume"])
- else:
Advertisement
Add Comment
Please, Sign In to add comment