#include <regex.h>
#include <sys/types.h>
#include <dirent.h>
-#include <openssl/rc4.h>
#include "para.h"
#include "error.h"
return;
if (ct->rc4c.fd >= 0)
close(ct->rc4c.fd);
+ stream_cipher_free(ct->rc4c.recv);
+ stream_cipher_free(ct->rc4c.send);
free(ct->user);
free(ct->config_file);
free(ct->key_file);
if (ret < 0 || n == 0)
goto out;
PARA_INFO_LOG("<-- [challenge] (%zu bytes)\n", n);
- ret = para_decrypt_buffer(ct->key_file, crypt_buf,
+ ret = priv_decrypt(ct->key_file, crypt_buf,
(unsigned char *)buf, n);
if (ret < 0)
goto out;
sha1_hash((char *)crypt_buf, CHALLENGE_SIZE, challenge_sha1);
- RC4_set_key(&ct->rc4c.send_key, RC4_KEY_LEN,
- crypt_buf + CHALLENGE_SIZE);
- RC4_set_key(&ct->rc4c.recv_key, RC4_KEY_LEN,
- crypt_buf + CHALLENGE_SIZE + RC4_KEY_LEN);
+ ct->rc4c.send = stream_cipher_new(crypt_buf + CHALLENGE_SIZE,
+ RC4_KEY_LEN);
+ ct->rc4c.recv = stream_cipher_new(crypt_buf + CHALLENGE_SIZE
+ + RC4_KEY_LEN, RC4_KEY_LEN);
hash_to_asc(challenge_sha1, buf);
PARA_INFO_LOG("--> %s\n", buf);
ret = send_bin_buffer(ct->rc4c.fd, (char *)challenge_sha1,