0001-python3-use-binascii-s-hexadecimal-encoding-hexlify-.patch

Paul Marillonnet, 06 mars 2019 19:56

Voir les différences: en ligne côte à côte

Subject: [PATCH] python3: use binascii's hexadecimal encoding "hexlify"
 (#31163)

 src/authentic2/hashers.py    | 11 ++++++-----
 src/authentic2/middleware.py |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

     import hashlib
     import math
     import base64
     from binascii import hexlify
     from collections import OrderedDict
     from django.contrib.auth import hashers
-...
             algo_name, salt_offset, hex_encode = OPENLDAP_ALGO_MAPPING[algo]
             salt, password = (password[salt_offset:], password[:salt_offset]) if salt_offset else ('', password)
             if hex_encode:
                 password = password.encode('hex')
             return '%s$%s$%s' % (algo_name, salt.encode('hex'), password)
                 password = hexlify(password)
             return '%s$%s$%s' % (algo_name, hexlify(salt), password)
         else:
             return make_password(password)
-...
             assert password
             assert '$' not in salt
             hash = self.digest(force_bytes(password + salt)).hexdigest()
             return "%s$%s$%s" % (self.algorithm, salt.encode('hex'), hash)
             return "%s$%s$%s" % (self.algorithm, hexlify(salt), hash)
         def verify(self, password, encoded):
             algorithm, salt, hash = encoded.split('$', 2)
-...
             assert password
             assert '$' not in salt
             hash = self.digest(force_bytes(password + salt)).hexdigest()
             return "%s$md5$%s$%s" % (self.algorithm, salt.encode('hex'), hash)
             return "%s$md5$%s$%s" % (self.algorithm, hexlify(salt), hash)
         def verify(self, password, encoded):
             algorithm, subalgo, salt, hash = encoded.split('$', 3)
-...
                     h, salt = encoded.split(':', 1)
                 else:
                     h, salt = encoded, ''
                 return '%s$md5$%s$%s' % (cls.algorithm, salt.encode('hex'), h)
                 return '%s$md5$%s$%s' % (cls.algorithm, hexlify(salt), h)
         @classmethod
         def to_joomla(cls, encoded):

     except ImportError:
         threading = None
     from binascii import hexlify
     from django.conf import settings
     from django.contrib import messages
     from django.utils.translation import ugettext as _
-...
                     # Use Mersennes Twister rng, no need for a cryptographic grade
                     # rng in this case
                     random_id = random.getrandbits(32)
                     request.request_id = struct.pack('I', random_id).encode('hex')
                     request.request_id = hexlify(struct.pack('I', random_id))
     class StoreRequestMiddleware(object):
         collection = {}
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-python3-use-binascii-s-hexadecimal-encoding-hexlify-.patch