Merge pull request #991 from TeraTermProject/refactor/#550-kex

KEX をリファクタリング #550

Author: nmaya

ttssh2/ttxssh/buffer.c

@@ -334,6 +334,11 @@ void buffer_put_cstring(buffer_t *msg, const char *ptr)
 	buffer_put_string(msg, ptr, strlen(ptr));
 }
 
+void buffer_put_stringb(buffer_t *msg, buffer_t *v)
+{
+	buffer_put_string(msg, buffer_ptr(v), buffer_len(v));
+}
+
 void buffer_put_char(buffer_t *msg, int value)
 {
 	char ch = (char)value;

ttssh2/ttxssh/buffer.h

@@ -53,6 +53,7 @@ void buffer_put_raw(buffer_t *msg, const void *ptr, size_t size);
 char *buffer_get_string(char **data_ptr, int *buflen_ptr);
 void buffer_put_string(buffer_t *msg, const char *ptr, size_t size);
 void buffer_put_cstring(buffer_t *msg, const char *ptr);
+void buffer_put_stringb(buffer_t *msg, buffer_t *v);
 void buffer_put_char(buffer_t *msg, int value);
 void buffer_put_padding(buffer_t *msg, size_t size);
 void buffer_put_int(buffer_t *msg, int value);

ttssh2/ttxssh/cipher.h

@@ -83,7 +83,7 @@ typedef enum {
 	SSH_CIPHER_MAX = SSH2_CIPHER_CHACHAPOLY,
 } SSHCipherId;
 
-struct ssh2cipher {
+typedef struct ssh2cipher {
 	SSHCipherId id;
 	char *name;
 	u_int block_size;
@@ -92,7 +92,7 @@ struct ssh2cipher {
 	u_int iv_len;
 	u_int auth_len;
 	const EVP_CIPHER *(*func)(void);
-};
+} ssh2cipher;
 
 struct sshcipher_ctx {
 	// TTSSH では SSH_CIPHER_NONE が無効なので、plaintext は使用されない

ttssh2/ttxssh/crypt.c

@@ -1041,9 +1041,9 @@ BOOL CRYPT_start_encryption(PTInstVar pvar, int sender_flag, int receiver_flag)
 		}
 		else {
 			// SSH2
-			cipher = pvar->ciphers[MODE_OUT];
+			cipher = pvar->kex->ciphers[MODE_OUT];
 			if (cipher) {
-				pvar->crypt_state.sender_cipher = get_cipher_id(pvar->ciphers[MODE_OUT]);
+				pvar->crypt_state.sender_cipher = get_cipher_id(pvar->kex->ciphers[MODE_OUT]);
 				enc = &pvar->ssh2_keys[MODE_OUT].enc;
 				cipher_init_SSH2(&pvar->cc[MODE_OUT], cipher,
 				                 enc->key, enc->key_len,
@@ -1087,9 +1087,9 @@ BOOL CRYPT_start_encryption(PTInstVar pvar, int sender_flag, int receiver_flag)
 		}
 		else {
 			// SSH2
-			cipher = pvar->ciphers[MODE_IN];
+			cipher = pvar->kex->ciphers[MODE_IN];
 			if (cipher) {
-				pvar->crypt_state.receiver_cipher = get_cipher_id(pvar->ciphers[MODE_IN]);
+				pvar->crypt_state.receiver_cipher = get_cipher_id(pvar->kex->ciphers[MODE_IN]);
 				enc = &pvar->ssh2_keys[MODE_IN].enc;
 				cipher_init_SSH2(&pvar->cc[MODE_IN], cipher,
 				                 enc->key, enc->key_len,
@@ -1157,17 +1157,17 @@ void CRYPT_get_server_key_info(PTInstVar pvar, char *dest, int len)
 			RSA_get0_key(pvar->crypt_state.host_key.RSA_key, &host_n, NULL, NULL);
 
 			UTIL_get_lang_msgU8("DLG_ABOUT_KEY_INFO", pvar,
-								"%d-bit server key, %d-bit host key");
+			                    "%d-bit server key, %d-bit host key");
 			_snprintf_s(dest, len, _TRUNCATE, pvar->UIMsg,
 			            BN_num_bits(server_n),
 			            BN_num_bits(host_n));
 		}
 	} else { // SSH2
 			UTIL_get_lang_msgU8("DLG_ABOUT_KEY_INFO2", pvar,
-								"%d-bit client key, %d-bit server key");
+			                    "%d-bit client key, %d-bit server key");
 			_snprintf_s(dest, len, _TRUNCATE, pvar->UIMsg,
-			            pvar->client_key_bits,
-			            pvar->server_key_bits);
+			            pvar->kex->client_key_bits,
+			            pvar->kex->server_key_bits);
 	}
 }
 

ttssh2/ttxssh/hostkey.c

@@ -292,7 +292,7 @@ ssh_keyalgo choose_SSH2_keysign_algorithm(PTInstVar pvar, ssh_keytype keytype)
 {
 	char buff[128];
 	const struct ssh2_host_key_t *ptr = ssh2_host_key;
-	char *server_proposal = pvar->server_sig_algs;
+	char *server_proposal = pvar->kex->server_sig_algs;
 
 	if (keytype == KEY_RSA) {
 		if (server_proposal == NULL) {