diff options
Diffstat (limited to 'libqpdf/RC4_native.cc')
| -rw-r--r-- | libqpdf/RC4_native.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libqpdf/RC4_native.cc b/libqpdf/RC4_native.cc index 8559d9bd..bb0b9013 100644 --- a/libqpdf/RC4_native.cc +++ b/libqpdf/RC4_native.cc @@ -17,7 +17,7 @@ RC4_native::RC4_native(unsigned char const* key_data, int key_len) { if (key_len == -1) { - key_len = QIntC::to_int( + key_len = QIntC::to_int( strlen(reinterpret_cast<char const*>(key_data))); } @@ -32,9 +32,9 @@ RC4_native::RC4_native(unsigned char const* key_data, int key_len) int i2 = 0; for (int i = 0; i < 256; ++i) { - i2 = (key_data[i1] + key.state[i] + i2) % 256; - swap_byte(key.state[i], key.state[i2]); - i1 = (i1 + 1) % key_len; + i2 = (key_data[i1] + key.state[i] + i2) % 256; + swap_byte(key.state[i], key.state[i2]); + i1 = (i1 + 1) % key_len; } } @@ -43,16 +43,16 @@ RC4_native::process(unsigned char *in_data, size_t len, unsigned char* out_data) { if (out_data == 0) { - // Convert in place - out_data = in_data; + // Convert in place + out_data = in_data; } for (size_t i = 0; i < len; ++i) { - key.x = static_cast<unsigned char>((key.x + 1) % 256); - key.y = static_cast<unsigned char>((key.state[key.x] + key.y) % 256); - swap_byte(key.state[key.x], key.state[key.y]); - int xor_index = (key.state[key.x] + key.state[key.y]) % 256; - out_data[i] = in_data[i] ^ key.state[xor_index]; + key.x = static_cast<unsigned char>((key.x + 1) % 256); + key.y = static_cast<unsigned char>((key.state[key.x] + key.y) % 256); + swap_byte(key.state[key.x], key.state[key.y]); + int xor_index = (key.state[key.x] + key.state[key.y]) % 256; + out_data[i] = in_data[i] ^ key.state[xor_index]; } } |