uploaded version 2018_11_15 for python3

This commit is contained in:
Matteo ℱan 2018-11-14 23:13:51 +01:00 committed by GitHub
parent 7130486efc
commit e98858c9d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 1204 additions and 853 deletions

View file

@ -1,9 +1,7 @@
#!/usr/bin/env python3
import binascii
import hashlib
import hmac
import random
import struct
import aes
@ -37,13 +35,10 @@ class kmsRequestV6(kmsRequestV5):
def encryptResponse(self, request, decrypted, response):
randomSalt = self.getRandomSalt()
result = hashlib.sha256(randomSalt).digest()
sha256 = hashlib.sha256()
sha256.update(randomSalt) #*2to3*
result = sha256.digest()
SaltC = bytearray(request['message']['salt'].encode('latin-1')) #*2to3*
DSaltC = bytearray(decrypted['salt'].encode('latin-1')) #*2to3*
SaltC = bytearray(request['message']['salt'].encode('latin-1'))
DSaltC = bytearray(decrypted['salt'].encode('latin-1'))
randomStuff = bytearray(16)
for i in range(0,16):
@ -56,9 +51,9 @@ class kmsRequestV6(kmsRequestV5):
message = self.DecryptedResponse.Message()
message['response'] = response
message['keys'] = randomStuff #*2to3*
message['keys'] = randomStuff
message['hash'] = result
message['xorSalts'] = XorSalts #*2to3*
message['xorSalts'] = XorSalts
message['hwid'] = self.config['hwid']
# SaltS
@ -66,7 +61,7 @@ class kmsRequestV6(kmsRequestV5):
moo = aes.AESModeOfOperation()
moo.aes.v6 = True
decry = moo.decrypt(SaltS, 16, moo.ModeOfOperation["CBC"], self.key, moo.aes.KeySize["SIZE_128"], SaltS) #*2to3*
decry = moo.decrypt(SaltS, 16, moo.ModeOfOperation["CBC"], self.key, moo.aes.KeySize["SIZE_128"], SaltS)
# DSaltS
DSaltS = bytearray(decry)
@ -75,22 +70,22 @@ class kmsRequestV6(kmsRequestV5):
HMacMsg = bytearray(16)
for i in range(0,16):
HMacMsg[i] = (SaltS[i] ^ DSaltS[i]) & 0xff
HMacMsg.extend(str(message).encode('latin-1')) #*2to3*
HMacMsg.extend(str(message).encode('latin-1'))
# HMacKey
requestTime = decrypted['request']['requestTime']
HMacKey = self.getMACKey(requestTime)
HMac = hmac.new(HMacKey, HMacMsg, hashlib.sha256) #*2to3*
HMac = hmac.new(HMacKey, HMacMsg, hashlib.sha256)
digest = HMac.digest()
responsedata = self.DecryptedResponse()
responsedata['message'] = message
responsedata['hmac'] = digest[16:]
padded = aes.append_PKCS7_padding(str(responsedata).encode('latin-1')) #*2to3*
mode, orig_len, crypted = moo.encrypt(padded, moo.ModeOfOperation["CBC"], self.key, moo.aes.KeySize["SIZE_128"], SaltS) #*2to3*
padded = aes.append_PKCS7_padding(str(responsedata).encode('latin-1'))
mode, orig_len, crypted = moo.encrypt(padded, moo.ModeOfOperation["CBC"], self.key, moo.aes.KeySize["SIZE_128"], SaltS)
return SaltS.decode('latin-1').encode('latin-1'), crypted #*2to3*
return SaltS.decode('latin-1').encode('latin-1'), crypted
def getMACKey(self, t):
@ -98,7 +93,7 @@ class kmsRequestV6(kmsRequestV5):
c2 = 0x000000208CBAB5ED
c3 = 0x3156CD5AC628477A
i1 = (t // c1) & 0xFFFFFFFFFFFFFFFF #*2to3*
i1 = (t // c1) & 0xFFFFFFFFFFFFFFFF
i2 = (i1 * c2) & 0xFFFFFFFFFFFFFFFF
seed = (i2 + c3) & 0xFFFFFFFFFFFFFFFF