dnrops
/
rex-text
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Land #0001, Fix unicode conversion for SMB Logins

This commit is contained in:
Brendan 2016-09-01 09:59:27 -05:00
parent 2f4b26bc0a d7f34c7c62
commit 197558ff6c
No known key found for this signature in database
GPG Key ID: ECC0F0A52E65F268
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/rex/text/unicode.rb
View File

@ -47,13 +47,13 @@ module Rex
return '' if not str
case type
when 'utf-16le'
return str.unpack('C*').pack('v*')
return str.unpack('U*').pack('v*')
when 'utf-16be'
return str.unpack('C*').pack('n*')
return str.unpack('U*').pack('n*')
when 'utf-32le'
return str.unpack('C*').pack('V*')
return str.unpack('U*').pack('V*')
when 'utf-32be'
return str.unpack('C*').pack('N*')
return str.unpack('U*').pack('N*')
when 'utf-7'
case mode
when 'all'
@ -252,13 +252,13 @@ module Rex
return '' if not str
case type
when 'utf-16le'
return str.unpack('v*').pack('C*')
return str.unpack('v*').pack('U*')
when 'utf-16be'
return str.unpack('n*').pack('C*')
return str.unpack('n*').pack('U*')
when 'utf-32le'
return str.unpack('V*').pack('C*')
return str.unpack('V*').pack('U*')
when 'utf-32be'
return str.unpack('N*').pack('C*')
return str.unpack('N*').pack('U*')
when 'utf-7'
raise TypeError, 'invalid utf type, not yet implemented'
when 'utf-8'