hoelee/Telethon
1
0
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-06-18 19:16:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Actually perform all checks in 2fa

Browse Source
This commit is contained in:
Lonami Exo 2018-12-24 14:16:50 +01:00
parent a623006ea0
commit d2ac7e5b0a
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
telethon/crypto/factorization.py
View File

@ -47,7 +47,8 @@ class Factorization:
if g > 1: if g > 1:
break break
return g, pq // g p, q = g, pq // g
return (p, q) if p < q else (q, p)
@staticmethod @staticmethod
def gcd(a, b): def gcd(a, b):

2
telethon/network/authenticator.py
View File

@ -38,7 +38,7 @@ async def do_authentication(sender):
# Step 2 sending: DH Exchange # Step 2 sending: DH Exchange
p, q = Factorization.factorize(pq) p, q = Factorization.factorize(pq)
p, q = rsa.get_byte_array(min(p, q)), rsa.get_byte_array(max(p, q)) p, q = rsa.get_byte_array(p), rsa.get_byte_array(q)
new_nonce = int.from_bytes(os.urandom(32), 'little', signed=True) new_nonce = int.from_bytes(os.urandom(32), 'little', signed=True)
pq_inner_data = bytes(PQInnerData( pq_inner_data = bytes(PQInnerData(

12
telethon/password.py
View File

@ -1,6 +1,7 @@
import hashlib import hashlib
import os import os
from .crypto import factorization
from .tl import types from .tl import types
@ -10,7 +11,9 @@ def check_prime_and_good_check(prime: int, g: int):
raise ValueError('bad prime count {}, expected {}' raise ValueError('bad prime count {}, expected {}'
.format(prime.bit_length(), good_prime_bits_count)) .format(prime.bit_length(), good_prime_bits_count))
# TODO if not is_prime(prime) raise if factorization.Factorization.factorize(prime)[0] != 1:
raise ValueError('given "prime" is not prime')
if g == 2: if g == 2:
if prime % 8 != 7: if prime % 8 != 7:
raise ValueError('bad g {}, mod8 {}'.format(g, prime % 8)) raise ValueError('bad g {}, mod8 {}'.format(g, prime % 8))
@ -32,8 +35,10 @@ def check_prime_and_good_check(prime: int, g: int):
raise ValueError('bad g {}'.format(g)) raise ValueError('bad g {}'.format(g))
prime_sub1_div2 = (prime - 1) // 2 prime_sub1_div2 = (prime - 1) // 2
# TODO if not is_prime(prime_sub1_div2) raise if factorization.Factorization.factorize(prime_sub1_div2)[0] != 1:
# It's good raise ValueError('(prime - 1) // 2 is not prime')
# Else it's good
def check_prime_and_good(prime_bytes: bytes, g: int): def check_prime_and_good(prime_bytes: bytes, g: int):
@ -112,6 +117,7 @@ def compute_hash(algo: types.PasswordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter1000
return sha256(algo.salt2, hash3, algo.salt2) return sha256(algo.salt2, hash3, algo.salt2)
# https://github.com/telegramdesktop/tdesktop/blob/18b74b90451a7db2379a9d753c9cbaf8734b4d5d/Telegram/SourceFiles/core/core_cloud_password.cpp
def compute_check(request: types.account.Password, password: str): def compute_check(request: types.account.Password, password: str):
algo = request.current_algo algo = request.current_algo
if not isinstance(algo, types.PasswordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter100000SHA256ModPow): if not isinstance(algo, types.PasswordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter100000SHA256ModPow):