summaryrefslogtreecommitdiff
path: root/src/protocol/internal
diff options
context:
space:
mode:
Diffstat (limited to 'src/protocol/internal')
-rw-r--r--src/protocol/internal/fqterm_ssh_kex.cpp3
-rw-r--r--src/protocol/internal/fqterm_ssh_kex.h3
-rw-r--r--src/protocol/internal/fqterm_ssh_packet.h14
3 files changed, 6 insertions, 14 deletions
diff --git a/src/protocol/internal/fqterm_ssh_kex.cpp b/src/protocol/internal/fqterm_ssh_kex.cpp
index d46ba76..32db7d0 100644
--- a/src/protocol/internal/fqterm_ssh_kex.cpp
+++ b/src/protocol/internal/fqterm_ssh_kex.cpp
@@ -186,7 +186,8 @@ void FQTermSSH1Kex::makeSessionKey() {
packet_sender_->putInt(1);
packet_sender_->write();
- emit startEncryption(session_key_);
+ packet_sender_->startEncryption(session_key_, NULL);
+ packet_receiver_->startEncryption(session_key_, NULL);
}
void FQTermSSH1Kex::makeSessionId() {
diff --git a/src/protocol/internal/fqterm_ssh_kex.h b/src/protocol/internal/fqterm_ssh_kex.h
index 2bd46b8..bb668a6 100644
--- a/src/protocol/internal/fqterm_ssh_kex.h
+++ b/src/protocol/internal/fqterm_ssh_kex.h
@@ -61,9 +61,6 @@ signals:
void kexOK();
void reKex();
void kexError(QString);
-
- void startEncryption(const u_char *sessionkey);
-
};
class FQTermSSH1Kex: public FQTermSSHKex {
diff --git a/src/protocol/internal/fqterm_ssh_packet.h b/src/protocol/internal/fqterm_ssh_packet.h
index 806918e..bb6adf5 100644
--- a/src/protocol/internal/fqterm_ssh_packet.h
+++ b/src/protocol/internal/fqterm_ssh_packet.h
@@ -57,14 +57,11 @@ class FQTermSSHPacketSender: public QObject {
virtual int getKeySize() const { return cipher->keySize;}
int getMacKeySize() const { return mac->keySize;}
- public slots:
void startEncryption(const u_char *key, const u_char *IV = NULL);
- void resetEncryption();
-
void startMac(const u_char *sessionkey);
void resetMac();
-
- void enableCompress(int enable) {is_compressed_ = enable;};
+ public slots:
+ void resetEncryption();
signals:
void dataToWrite();
@@ -109,14 +106,11 @@ class FQTermSSHPacketReceiver: public QObject {
int getMacKeySize() const { return mac->keySize;}
virtual void parseData(buffer *input) = 0;
- public slots:
void startEncryption(const u_char *key, const u_char *IV = NULL);
- void resetEncryption();
-
void startMac(const u_char *sessionkey);
void resetMac();
-
- void enableCompress(int enable) {is_compressed_ = enable;};
+ public slots:
+ void resetEncryption();
signals:
void packetAvaliable(int type);