@@ -47,8 +47,8 @@ def self.hash_argon2i(password, salt, t_cost, m_cost)
47
47
48
48
def self . hash_argon2i_encode ( password , salt , t_cost , m_cost , secret )
49
49
result = ''
50
- secretlen = secret . nil? ? 0 : secret . length
51
- passwordlen = password . nil? ? 0 : password . length
50
+ secretlen = secret . nil? ? 0 : secret . bytesize
51
+ passwordlen = password . nil? ? 0 : password . bytesize
52
52
if salt . length != Constants ::SALT_LEN
53
53
raise ArgonHashFail , "Invalid salt size"
54
54
end
@@ -63,8 +63,10 @@ def self.hash_argon2i_encode(password, salt, t_cost, m_cost, secret)
63
63
end
64
64
65
65
def self . argon2i_verify ( pwd , hash , secret )
66
- secretlen = secret . nil? ? 0 : secret . length
67
- ret = Ext . wrap_argon2_verify ( hash , pwd , pwd . length , secret , secretlen )
66
+ secretlen = secret . nil? ? 0 : secret . bytesize
67
+ passwordlen = pwd . nil? ? 0 : pwd . bytesize
68
+
69
+ ret = Ext . wrap_argon2_verify ( hash , pwd , passwordlen , secret , secretlen )
68
70
return false if ERRORS [ ret ] == 'ARGON2_DECODING_FAIL'
69
71
raise ArgonHashFail , ERRORS [ ret ] unless ret == 0
70
72
true
0 commit comments