fix for python3 TypeError: ord() expected string of length 1, but int… #128
Conversation
| salt = struct.pack('!H', random_generator.randrange(0, 65535)) | ||
| salt = chr(ord(salt[0]) | 1 << 7)+salt[1] | ||
| if six.PY3: | ||
| random_value = 32768 + random_generator.randrange(0, 32767) |
There was a problem hiding this comment.
I don't think this is correct, this is effectively a random number between 32768 and 65535 when it should be between 0 and 65535 (the full range of 2 bytes). The random value calculation is the same for the python2 and python3 case, so move it please out of the conditional blocks.
pyrad/packet.py
Outdated
| #salt = struct.pack('!H', random_generator.randrange(0, 65535)) | ||
| #salt = chr(ord(salt[0]) | 1 << 7)+salt[1] | ||
|
|
||
| length = struct.pack("B", len(value)) | ||
| buf = length + value | ||
| if len(buf) % 16 != 0: | ||
| buf += six.b('\x00') * (16 - (len(buf) % 16)) | ||
|
|
||
| result = six.b(salt) | ||
| #result = six.b(salt) |
There was a problem hiding this comment.
Please delete commented out statements.
|
Hi Istvan, please double check RFC 2868: |
|
thanks for pointing that out, I've looked at the RFC earlier, but I completely missed that. |
python3 compatibility for SaltCrypt()