Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Move constant-time compare function to utils.security

Browse source
This commit is contained in:
jesopo 2019-02-12 11:57:49 +00:00
parent 305b998a52
commit 9667b8a6e0
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/sasl/scram.py
View file

@ -1,4 +1,5 @@
import base64, enum, hashlib, hmac, os, typing
from src import utils
# IANA Hash Function Textual Names
# https://tools.ietf.org/html/rfc5802#section-4
@ -101,7 +102,7 @@ class SCRAM(object):
server_key = self._hmac(self._salted_password, b"Server Key")
server_signature = self._hmac(server_key, self._auth_message)
if self._constant_time_compare(server_signature, verifier):
if utils.security.constant_time_compare(server_signature, verifier):
self.state = SCRAMState.Success
return True
else:

7
src/utils/security.py
View file

@ -1,4 +1,4 @@
import socket, ssl
import hmac, socket, ssl, typing
def ssl_context(cert: str=None, key: str=None, verify: bool=True
) -> ssl.SSLContext:
@ -21,3 +21,8 @@ def ssl_wrap(sock: socket.socket, cert: str=None, key: str=None,
context = ssl_context(cert=cert, key=key, verify=verify)
return context.wrap_socket(sock, server_side=server_side,
server_hostname=hostname)
def constant_time_compare(
a: typing.Union[str, bytes],
b: typing.Union[str, bytes]) -> bool:
return hmac.compare_digest(a, b)