Diff of /trunk/ttssh2/ttxssh/hostkey.c

OSDN > Find Software > Tera Term

 Browse Subversion Repository



/[ttssh2]/trunk/ttssh2/ttxssh/hostkey.c




Diff of /trunk/ttssh2/ttxssh/hostkey.c



 Parent Directory

|  Revision Log



|  Patch














revision 10068 by doda,
Sun Jul 17 15:39:53 2022 UTC




revision 10069 by doda,
Sun Jul 17 15:40:06 2022 UTC






#

Line 113 
 char *get_ssh2_hostkey_type_name_from_ke


Line 113 
 char *get_ssh2_hostkey_type_name_from_ke












113
         return get_ssh2_hostkey_type_name(key->type);
         return get_ssh2_hostkey_type_name(key->type);

















114
 }
 }

















115
 
 















116


 char* get_ssh2_keyalgo_name(ssh_keyalgo algo)


 char* get_ssh2_hostkey_algorithm_name(ssh_keyalgo algo)















117
 {
 {

















118
         const struct ssh2_host_key_t *ptr = ssh2_host_key;
         const struct ssh2_host_key_t *ptr = ssh2_host_key;

















119
 
 











#

Line 128 
 char* get_ssh2_keyalgo_name(ssh_keyalgo


Line 128 
 char* get_ssh2_keyalgo_name(ssh_keyalgo












128
         return "ssh-unknown";
         return "ssh-unknown";

















129
 }
 }

















130
 
 















131


 ssh_keyalgo get_ssh2_keyalgo_from_name(const char *name)


 ssh_keyalgo get_ssh2_hostkey_algorithm_from_name(const char *name)















132
 {
 {

















133
         const struct ssh2_host_key_t *ptr = ssh2_host_key;
         const struct ssh2_host_key_t *ptr = ssh2_host_key;

















134
 
 











#

Line 158 
 int get_ssh2_key_hashtype(ssh_keyalgo al


Line 158 
 int get_ssh2_key_hashtype(ssh_keyalgo al












158
         return NID_sha1;
         return NID_sha1;

















159
 }
 }

















160
 
 















161


 ssh_keytype get_ssh2_keytype_from_keyalgo(ssh_keyalgo algo)


 ssh_keytype get_ssh2_hostkey_type_from_algorithm(ssh_keyalgo algo)















162
 {
 {

















163
         const struct ssh2_host_key_t *ptr = ssh2_host_key;
         const struct ssh2_host_key_t *ptr = ssh2_host_key;

















164
 
 











#

Line 173 
 ssh_keytype get_ssh2_keytype_from_keyalg


Line 173 
 ssh_keytype get_ssh2_keytype_from_keyalg












173
         return KEY_UNSPEC;
         return KEY_UNSPEC;

















174
 }
 }

















175
 
 















176


 const char* get_ssh2_keytype_name_from_keyalgo(ssh_keyalgo algo)


 const char* get_ssh2_hostkey_type_name_from_algorithm(ssh_keyalgo algo)















177
 {
 {















178


         return get_ssh2_hostkey_type_name(get_ssh2_keytype_from_keyalgo(algo));


         return get_ssh2_hostkey_type_name(get_ssh2_hostkey_type_from_algorithm(algo));















179
 }
 }

















180
 
 

















181
 char* get_digest_algorithm_name(digest_algorithm id)
 char* get_digest_algorithm_name(digest_algorithm id)











#

Line 218 
 ssh_keyalgo choose_SSH2_host_key_algorit


Line 218 
 ssh_keyalgo choose_SSH2_host_key_algorit












218
 
 

















219
         choose_SSH2_proposal(server_proposal, my_proposal, str_keytype, sizeof(str_keytype));
         choose_SSH2_proposal(server_proposal, my_proposal, str_keytype, sizeof(str_keytype));

















220
 
 















221


         return get_ssh2_keyalgo_from_name(str_keytype);


         return get_ssh2_hostkey_algorithm_from_name(str_keytype);















222
 }
 }

















223
 
 

















224
 // Host Keyアルゴリズム優先順位に応じて、myproposal[]を書き換える。
 // Host Keyアルゴリズム優先順位に応じて、myproposal[]を書き換える。











#

Line 239 
 void SSH2_update_host_key_myproposal(PTI


Line 239 
 void SSH2_update_host_key_myproposal(PTI












239
                 index = pvar->settings.HostKeyOrder[i] - '0';
                 index = pvar->settings.HostKeyOrder[i] - '0';

















240
                 if (index == KEY_NONE) // disabled line
                 if (index == KEY_NONE) // disabled line

















241
                         break;
                         break;















242


                 strncat_s(buf, sizeof(buf), get_ssh2_keyalgo_name(index), _TRUNCATE);


                 strncat_s(buf, sizeof(buf), get_ssh2_hostkey_algorithm_name(index), _TRUNCATE);















243
                 strncat_s(buf, sizeof(buf), ",", _TRUNCATE);
                 strncat_s(buf, sizeof(buf), ",", _TRUNCATE);

















244
         }
         }

















245
         len = strlen(buf);
         len = strlen(buf);











#

Line 267 
 ssh_keyalgo choose_SSH2_keysign_algorith


Line 267 
 ssh_keyalgo choose_SSH2_keysign_algorith












267
                         }
                         }

















268
                         else {
                         else {

















269
                                 logprintf(LOG_LEVEL_VERBOSE, "%s: %s is selected.", __FUNCTION__, buff);
                                 logprintf(LOG_LEVEL_VERBOSE, "%s: %s is selected.", __FUNCTION__, buff);















270


                                 return get_ssh2_keyalgo_from_name(buff);


                                 return get_ssh2_hostkey_algorithm_from_name(buff);















271
                         }
                         }

















272
                 }
                 }

















273
         }
         }





























Legend:



Removed from v.10068
 


changed lines


 
Added in v.10069













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/trunk/ttssh2/ttxssh/hostkey.c
-revision 10068 by doda,
Sun Jul 17 15:39:53 2022 UTC
+revision 10069 by doda,
Sun Jul 17 15:40:06 2022 UTC
 Line 113 
 char *get_ssh2_hostkey_type_name_from_ke
          return get_ssh2_hostkey_type_name(key->type);
  }
- char* get_ssh2_keyalgo_name(ssh_keyalgo algo)
+ char* get_ssh2_hostkey_algorithm_name(ssh_keyalgo algo)
  {
          const struct ssh2_host_key_t *ptr = ssh2_host_key;
 Line 128 
 char* get_ssh2_keyalgo_name(ssh_keyalgo
          return "ssh-unknown";
  }
- ssh_keyalgo get_ssh2_keyalgo_from_name(const char *name)
+ ssh_keyalgo get_ssh2_hostkey_algorithm_from_name(const char *name)
  {
          const struct ssh2_host_key_t *ptr = ssh2_host_key;
 Line 158 
 int get_ssh2_key_hashtype(ssh_keyalgo al
          return NID_sha1;
  }
- ssh_keytype get_ssh2_keytype_from_keyalgo(ssh_keyalgo algo)
+ ssh_keytype get_ssh2_hostkey_type_from_algorithm(ssh_keyalgo algo)
  {
          const struct ssh2_host_key_t *ptr = ssh2_host_key;
 Line 173 
 ssh_keytype get_ssh2_keytype_from_keyalg
          return KEY_UNSPEC;
  }
- const char* get_ssh2_keytype_name_from_keyalgo(ssh_keyalgo algo)
+ const char* get_ssh2_hostkey_type_name_from_algorithm(ssh_keyalgo algo)
  {
-         return get_ssh2_hostkey_type_name(get_ssh2_keytype_from_keyalgo(algo));
+         return get_ssh2_hostkey_type_name(get_ssh2_hostkey_type_from_algorithm(algo));
  }
  char* get_digest_algorithm_name(digest_algorithm id)
 Line 218 
 ssh_keyalgo choose_SSH2_host_key_algorit
          choose_SSH2_proposal(server_proposal, my_proposal, str_keytype, sizeof(str_keytype));
-         return get_ssh2_keyalgo_from_name(str_keytype);
+         return get_ssh2_hostkey_algorithm_from_name(str_keytype);
  }
  // Host Keyアルゴリズム優先順位に応じて、myproposal[]を書き換える。
 Line 239 
 void SSH2_update_host_key_myproposal(PTI
                  index = pvar->settings.HostKeyOrder[i] - '0';
                  if (index == KEY_NONE) // disabled line
                          break;
-                 strncat_s(buf, sizeof(buf), get_ssh2_keyalgo_name(index), _TRUNCATE);
+                 strncat_s(buf, sizeof(buf), get_ssh2_hostkey_algorithm_name(index), _TRUNCATE);
                  strncat_s(buf, sizeof(buf), ",", _TRUNCATE);
          }
          len = strlen(buf);
 Line 267 
 ssh_keyalgo choose_SSH2_keysign_algorith
                          }
                          else {
                                  logprintf(LOG_LEVEL_VERBOSE, "%s: %s is selected.", __FUNCTION__, buff);
-                                 return get_ssh2_keyalgo_from_name(buff);
+                                 return get_ssh2_hostkey_algorithm_from_name(buff);
                          }
                  }
          }
 Legend:



Removed from v.10068
 


changed lines


 
Added in v.10069
 Legend:



Removed from v.10068
 


changed lines


 
Added in v.10069
-Removed from v.10068
+Added in v.10069
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

Tera Term

Browse Subversion Repository