Tera TermRevision: 7887
https://osdn.net/projects/ttssh2/scm/svn/commits/7887
Author: yutakapon
Date: 2019-07-24 23:34:11 +0900 (Wed, 24 Jul 2019)
Log Message:
-----------
単体テスト完了した箇所のコメントを除去した。
key_size()でSSH1のキーサイズ取得誤りを修正した。
チケット #36876
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/36876
Modified Paths:
--------------
branches/openssl_1_1_1_v2/ttssh2/ttxssh/crypt.c
branches/openssl_1_1_1_v2/ttssh2/ttxssh/key.c
-------------- next part --------------
Modified: branches/openssl_1_1_1_v2/ttssh2/ttxssh/crypt.c
===================================================================
--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/crypt.c 2019-07-24 12:17:47 UTC (rev 7886)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/crypt.c 2019-07-24 14:34:11 UTC (rev 7887)
@@ -488,7 +488,6 @@
RSA *key = RSA_new();
BIGNUM *e = NULL, *n = NULL;
- /********* OPENSSL1.1.1 NOTEST *********/
if (key != NULL) {
// OpenSSL 1.1.0\x82ł\xCDRSA\x8D\\x91\xA2\x91̂̃\x81\x83\x93\x83o\x81[\x82ɒ\xBC\x90ڃA\x83N\x83Z\x83X\x82ł\xAB\x82Ȃ\xA2\x82\xBD\x82߁A
// RSA_set0_key\x8A\x94\x82Őݒ肷\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x81B
Modified: branches/openssl_1_1_1_v2/ttssh2/ttxssh/key.c
===================================================================
--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/key.c 2019-07-24 12:17:47 UTC (rev 7886)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/key.c 2019-07-24 14:34:11 UTC (rev 7887)
@@ -677,7 +677,6 @@
char* key_fingerprint_raw(Key *k, digest_algorithm dgst_alg, int *dgst_raw_length)
{
- /********* OPENSSL1.1.1 NOTEST *********/
const EVP_MD *md = NULL;
EVP_MD_CTX *ctx = NULL;
char *blob = NULL;
@@ -787,14 +786,13 @@
unsigned int
key_size(const Key *k)
{
- /********* OPENSSL1.1.1 NOTEST *********/
BIGNUM *n = NULL;
BIGNUM *p = NULL;
switch (k->type) {
case KEY_RSA1:
- RSA_get0_key(k->rsa, &n, NULL, NULL);
- return BN_num_bits(n);
+ // SSH1\x82̏ꍇ\x82\xCD key->rsa \x82\xC6 key->dsa \x82\xCD NULL \x82ł\xA0\x82\xE9\x82̂ŁA\x8Eg\x82\xED\x82Ȃ\xA2\x81B
+ return k->bits;
case KEY_RSA:
RSA_get0_key(k->rsa, &n, NULL, NULL);
return BN_num_bits(n);