@@ -1004,17 +1004,31 @@ def _test_pbkdf2_hmac(self, pbkdf2, supported):
10041004 self .assertEqual (out , expected ,
10051005 (digest_name , password , salt , rounds ))
10061006
1007- self .assertRaises (TypeError , pbkdf2 , b'sha1' , b'pass' , b'salt' , 1 )
1008- self .assertRaises (TypeError , pbkdf2 , 'sha1' , 'pass' , 'salt' , 1 )
1009- self .assertRaises (ValueError , pbkdf2 , 'sha1' , b'pass' , b'salt' , 0 )
1010- self .assertRaises (ValueError , pbkdf2 , 'sha1' , b'pass' , b'salt' , - 1 )
1011- self .assertRaises (ValueError , pbkdf2 , 'sha1' , b'pass' , b'salt' , 1 , 0 )
1012- self .assertRaises (ValueError , pbkdf2 , 'sha1' , b'pass' , b'salt' , 1 , - 1 )
10131007 with self .assertRaisesRegex (ValueError , 'unsupported hash type' ):
10141008 pbkdf2 ('unknown' , b'pass' , b'salt' , 1 )
1015- out = pbkdf2 (hash_name = 'sha1' , password = b'password' , salt = b'salt' ,
1016- iterations = 1 , dklen = None )
1017- self .assertEqual (out , self .pbkdf2_results ['sha1' ][0 ][0 ])
1009+
1010+ if 'sha1' in supported :
1011+ self .assertRaises (
1012+ TypeError , pbkdf2 , b'sha1' , b'pass' , b'salt' , 1
1013+ )
1014+ self .assertRaises (
1015+ TypeError , pbkdf2 , 'sha1' , 'pass' , 'salt' , 1
1016+ )
1017+ self .assertRaises (
1018+ ValueError , pbkdf2 , 'sha1' , b'pass' , b'salt' , 0
1019+ )
1020+ self .assertRaises (
1021+ ValueError , pbkdf2 , 'sha1' , b'pass' , b'salt' , - 1
1022+ )
1023+ self .assertRaises (
1024+ ValueError , pbkdf2 , 'sha1' , b'pass' , b'salt' , 1 , 0
1025+ )
1026+ self .assertRaises (
1027+ ValueError , pbkdf2 , 'sha1' , b'pass' , b'salt' , 1 , - 1
1028+ )
1029+ out = pbkdf2 (hash_name = 'sha1' , password = b'password' , salt = b'salt' ,
1030+ iterations = 1 , dklen = None )
1031+ self .assertEqual (out , self .pbkdf2_results ['sha1' ][0 ][0 ])
10181032
10191033 def test_pbkdf2_hmac_py (self ):
10201034 self ._test_pbkdf2_hmac (py_hashlib .pbkdf2_hmac , builtin_hashes )
0 commit comments