Projet

Général

Profil

0001-python3-encode-salt-before-hashing-in-crypto-submodu.patch

Paul Marillonnet, 18 avril 2019 14:19

Télécharger (1,2 ko)

Voir les différences: 

Subject: [PATCH 1/4] python3: encode salt before hashing in crypto submodule
 (#31171)


 src/authentic2/crypto.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
src/authentic2/crypto.py
99 99 
    key_size = 16
100 100 
    hmac_size = key_size
101 101 

  		




  102
  
  
    
    iv = hashmod.new(salt).digest()

  		




  
  102
  
    
    iv = hashmod.new(salt.encode('utf-8')).digest()

  		




  103
  103
  
    

  		




  104
  104
  
    
    prf = lambda secret, salt: HMAC.new(secret, salt, hashmod).digest()

  		




  105
  105
  
    

  		




  ......




  145
  145
  
    
        if not crypted or not hmac or prf(key, crypted)[:hmac_size] != hmac:

  		




  146
  146
  
    
            raise DecryptionError('invalid HMAC')

  		




  147
  147
  
    

  		




  148
  
  
    
        iv = hashmod.new(salt).digest()

  		




  
  148
  
    
        iv = hashmod.new(salt.encode('utf-8')).digest()

  		




  149
  149
  
    

  		




  150
  150
  
    
        aes_key = PBKDF2(key, iv, dkLen=key_size, count=count, prf=prf)

  		




  151
  151
  
    

  		




  152
  
  
    
-