Merge b6c6813d4158ab07a6860e630fb9c799824ad3b4 into 4623f878e08bc8f6f9253d4670569724d4c0a1b7

fix cipher bug
2025-01-19 06:19:31 +08:00 · 2024-06-10 19:17:55 -04:00 · 2024-06-10 05:22:12 -04:00
1 changed files with 2 additions and 2 deletions
--- a/connection.cpp
+++ b/connection.cpp
@ -435,7 +435,7 @@ int send_safer(conn_info_t &conn_info, char type, const char *data, int len)  //
        if (cipher_mode == cipher_xor) {
            send_data_buf2[0] ^= gro_xor[0];
            send_data_buf2[1] ^= gro_xor[1];
-        } else if (cipher_mode == cipher_aes128cbc || cipher_mode == cipher_aes128cbc) {
+        } else if (cipher_mode == cipher_aes128cbc || cipher_mode == cipher_aes128cfb) {
            aes_ecb_encrypt1(send_data_buf2);
        }
    }
@ -586,7 +586,7 @@ int recv_safer_multi(conn_info_t &conn_info, vector<char> &type_arr, vector<stri
            if (cipher_mode == cipher_xor) {
                recv_data[0] ^= gro_xor[0];
                recv_data[1] ^= gro_xor[1];
-            } else if (cipher_mode == cipher_aes128cbc || cipher_mode == cipher_aes128cbc) {
+            } else if (cipher_mode == cipher_aes128cbc || cipher_mode == cipher_aes128cfb) {
                aes_ecb_decrypt1(recv_data);
            }
            single_len = read_u16(recv_data);
Author	SHA1	Message	Date
Matt	b1748a2fd8	Merge b6c6813d4158ab07a6860e630fb9c799824ad3b4 into 4623f878e08bc8f6f9253d4670569724d4c0a1b7	2024-06-10 19:17:55 -04:00
yancey	4623f878e0	fix cipher bug	2024-06-10 05:22:12 -04:00