KEX の Client Secret の取得に DH_get0_key() を使うようにした
OpenSSL 3 では直接アクセスできないため
trunk/ttssh2/ttxssh/ssh.c (diff)| @@ -5098,7 +5098,7 @@ | ||
| 5098 | 5098 | buffer_t *msg = NULL; |
| 5099 | 5099 | unsigned char *outmsg; |
| 5100 | 5100 | int len; |
| 5101 | - BIGNUM *pub_key; | |
| 5101 | + BIGNUM *pub_key, *priv_key; | |
| 5102 | 5102 | |
| 5103 | 5103 | // Diffie-Hellman key agreement |
| 5104 | 5104 | switch (pvar->kex_type) { |
| @@ -5121,7 +5121,8 @@ | ||
| 5121 | 5121 | |
| 5122 | 5122 | // 秘密にすべき乱数(X)を生成 |
| 5123 | 5123 | dh_gen_key(pvar, dh, pvar->we_need); |
| 5124 | - log_kex_key(pvar, dh->priv_key); | |
| 5124 | + DH_get0_key(dh, NULL, &priv_key); | |
| 5125 | + log_kex_key(pvar, priv_key); | |
| 5125 | 5126 | |
| 5126 | 5127 | msg = buffer_init(); |
| 5127 | 5128 | if (msg == NULL) { |
| @@ -5273,7 +5274,7 @@ | ||
| 5273 | 5274 | buffer_t *msg = NULL; |
| 5274 | 5275 | unsigned char *outmsg; |
| 5275 | 5276 | char tmpbuf[256]; |
| 5276 | - BIGNUM *pub_key; | |
| 5277 | + BIGNUM *pub_key, *priv_key; | |
| 5277 | 5278 | |
| 5278 | 5279 | logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEX_DH_GEX_GROUP was received."); |
| 5279 | 5280 |
| @@ -5352,7 +5353,8 @@ | ||
| 5352 | 5353 | |
| 5353 | 5354 | // 秘密にすべき乱数(X)を生成 |
| 5354 | 5355 | dh_gen_key(pvar, dh, pvar->we_need); |
| 5355 | - log_kex_key(pvar, dh->priv_key); | |
| 5356 | + DH_get0_key(dh, NULL, &priv_key); | |
| 5357 | + log_kex_key(pvar, priv_key); | |
| 5356 | 5358 | |
| 5357 | 5359 | // 公開鍵をサーバへ送信 |
| 5358 | 5360 | msg = buffer_init(); |
Tera Term