Develop and Download Open Source Software

Browse Subversion Repository

Log of /branches/ssh_chacha20poly1305/ttssh2/ttxssh/keyfiles.c

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (download) (as text) (annotate)
Sticky Revision:

Revision 9209 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Apr 17 06:32:42 2021 UTC (2 years, 10 months ago) by nmaya
File length: 50242 byte(s)
Diff to previous 9208
OpenSSL 1.0.2 の API を使っているところを 1.1.0 の API に変更

- EVP_CIPHER_CTX_cleanup() -> EVP_CIPHER_CTX_free()
- EVP_CIPHER_CTX_init() -> EVP_CIPHER_CTX_reset()
- EVP_CIPHER_CTX_new() の中で 0 埋めされるので、EVP_CIPHER_CTX_init() を呼ばなくてよい所を削除

メモリの確保と解放を以下のような対応にした
- EVP_CIPHER_CTX_new() -> cipher_init_SSH2() したものは cipher_free_SSH2() で解放
- EVP_CIPHER_CTX_new() -> して cipher_init_SSH2() を通らないものは EVP_CIPHER_CTX_free() で解放

Revision 9208 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Apr 17 06:15:51 2021 UTC (2 years, 10 months ago) by nmaya
File length: 50430 byte(s)
Diff to previous 9049
create a branch for chacha20-poly1305

from 4-stable
planned to merge to 4-stable and trunk


Revision 9049 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Dec 16 12:24:26 2020 UTC (3 years, 2 months ago) by nmaya
Original Path: branches/4-stable/ttssh2/ttxssh/keyfiles.c
File length: 50430 byte(s)
Diff to previous 8934
ソースファイルの著作権表記の "最後の発行の年" を削除

ticket #40996

Revision 8934 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Sep 5 11:20:46 2020 UTC (3 years, 6 months ago) by youlab
Original Path: branches/4-stable/ttssh2/ttxssh/keyfiles.c
File length: 50434 byte(s)
Diff to previous 8437
Copyrightの2019を2020に変更した。
変更対象は下記の通り。

Tera Term
TTSSH
TTXKanjiMenu
Help
License


Revision 8437 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 13 03:11:16 2019 UTC (4 years, 2 months ago) by doda
Original Path: branches/4-stable/ttssh2/ttxssh/keyfiles.c
File length: 50434 byte(s)
Diff to previous 8316
Tera Term 4.xx メンテナンス用ブランチを作成


Revision 8316 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Oct 16 13:19:25 2019 UTC (4 years, 4 months ago) by yutakapon
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 50434 byte(s)
Diff to previous 7536
- TTSSHとTTProxyを OpenSSL 1.1.1 に対応した。
  ※OpenSSL 1.0.2ではビルドできません
- Win32 APIのWindows依存チェックツール(installer/checksymbol)を追加した。

branches/openssl_1_1_1_v3からリビジョン8258をマージ:
/branches/openssl_1_1_1_v2 ブランチの r7785 - r8256 をマージした。


........


Revision 7536 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Apr 1 12:45:02 2019 UTC (4 years, 11 months ago) by zmatsuo
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 49351 byte(s)
Diff to previous 7005
MinGWでビルドできるよう調整

Revision 7005 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Dec 18 11:06:06 2017 UTC (6 years, 2 months ago) by doda
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 49286 byte(s)
Diff to previous 7004
パスワード無しで bcrypt_KDF 形式で秘密鍵を保存した時に落ちるのを修正。

r7002 でのエンバグ。
get_cipher_by_name() で暗号が見つからなかった場合に SSH_CIPHER_NONE
へのポインタではなく、NULL を返すようにした。

Revision 7004 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Dec 18 10:41:13 2017 UTC (6 years, 2 months ago) by doda
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 49301 byte(s)
Diff to previous 7002
型名変更。主に見栄えの為。

・SSHCipher -> SSHCipherId
・ssh2_cipher_t -> SSH2Cipher

Revision 7002 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Dec 18 10:41:06 2017 UTC (6 years, 2 months ago) by doda
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 49304 byte(s)
Diff to previous 6985
暗号方式の管理を、暗号方式を表す値(SSHCipher)から ssh2_ciphers 内のエントリへのポインタを使うように変更。

これにより、暗号方式のパラメータ(ブロックサイズ等)が容易に参照できるようになる。
SSHCipher の値が欲しい時は cipher->id を使う。

Revision 6985 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 25 15:26:45 2017 UTC (6 years, 3 months ago) by doda
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 49337 byte(s)
Diff to previous 6841
SSH2 暗号化アルゴリズムとして aes{128,256}-gcm@openssh.com に対応した。

Revision 6841 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jul 4 15:02:28 2017 UTC (6 years, 8 months ago) by doda
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 49328 byte(s)
Diff to previous 6828
TeraTerm Project としてのライセンス表記を追加

・Tera Term 本体分を横 80 桁に収まるように改行位置を調整
・ttssh 関連の分を追加

Revision 6828 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 26 13:19:57 2017 UTC (6 years, 8 months ago) by maya
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 49251 byte(s)
Diff to previous 6825
鍵ファイルのフォーマットを追記

ドキュメントがあるわけではないので現状から。
動いているので間違ってはいないと思うが取れる裏がない。

Revision 6825 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 26 12:08:36 2017 UTC (6 years, 8 months ago) by maya
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 48336 byte(s)
Diff to previous 6818
公開鍵認証でECDSAのSECSH形式秘密鍵に対応

Revision 6818 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jun 23 15:00:44 2017 UTC (6 years, 8 months ago) by maya
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 46368 byte(s)
Diff to previous 6808
公開鍵認証でECDSA,Ed25519のPuTTY形式秘密鍵に対応

Revision 6808 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 19 12:50:21 2017 UTC (6 years, 8 months ago) by doda
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 43062 byte(s)
Diff to previous 6801
logprintf, logprintf_hexdump で引数で pvar を渡すのを廃止した。

Revision 6801 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jun 13 10:30:12 2017 UTC (6 years, 8 months ago) by doda
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 43246 byte(s)
Diff to previous 6711
eliminate FAR keyword.

Revision 6711 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 11 04:29:25 2017 UTC (6 years, 9 months ago) by doda
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 43264 byte(s)
Diff to previous 6710
バッファサイズ関連を unsigned へ変更

INT32_MAX より大きい値を扱う時に比較が正しく行われないのを回避する為に変更。
サーバ側より極端に大きい(異常な)値を正しくはじくのが目的。
演算でのオーバーフローの考慮はちゃんと行う必要があるので、別途チェックを強化する。

Revision 6710 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 11 04:29:22 2017 UTC (6 years, 9 months ago) by doda
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 43249 byte(s)
Diff to previous 6621
ログ出力を強化

Revision 6621 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Mar 9 07:55:28 2017 UTC (7 years ago) by doda
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 42523 byte(s)
Diff to previous 6229
base64 decode を ISC 由来のコードから自前実装に変更 [Ttssh2-devel 3043]

Revision 6229 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jan 1 11:06:37 2016 UTC (8 years, 2 months ago) by yutakapon
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 42530 byte(s)
Diff to previous 6019
チケット #35870 ゼロクリアの削除

memset()やZeroMemory()は、コンパイラの最適化で削除されることがあるため、
セキュリティ上削除されると困る箇所に関しては SecureZeroMemory() に置き換える。
SecureZeroMemory() はインライン関数のため、Windows95 でも動作する。


Revision 6019 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Sep 13 16:23:19 2015 UTC (8 years, 5 months ago) by yutakapon
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 42509 byte(s)
Diff to previous 5768
言語ファイルのスペルミスを修正した。
合わせて、ソースコードに埋め込まれている文章も修正した。




Revision 5768 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 29 08:38:56 2015 UTC (9 years, 1 month ago) by maya
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 42508 byte(s)
Diff to previous 5767
KDF フォーマットの SSH 秘密鍵をパスフレーズなしで復号できない問題を修正
生成した SSH 秘密鍵をパスフレーズなしの KDF フォーマットで保存するときに暗号化してしまう問題を修正

Revision 5767 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 27 16:59:40 2015 UTC (9 years, 1 month ago) by maya
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 42220 byte(s)
Diff to previous 5556
コメント修正
変数名修正

Revision 5556 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Mar 23 10:58:50 2014 UTC (9 years, 11 months ago) by yutakapon
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 42224 byte(s)
Diff to previous 5552
PuTTY秘密鍵およびSECSH秘密鍵の読み込み処理で、cipher contextを
解放していなかった問題を修正した。


Revision 5552 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Mar 19 15:22:45 2014 UTC (9 years, 11 months ago) by maya
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 42074 byte(s)
Diff to previous 5545
ファイル形式がわからない SSH 秘密鍵も PEM_read_PrivateKey() で読み込みに行くようにした

Revision 5545 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Mar 17 16:06:58 2014 UTC (9 years, 11 months ago) by yutakapon
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 42062 byte(s)
Diff to previous 5284
チケット #33263
Curve25519楕円曲線DH(Diffe Hellman)アルゴリズムを使った鍵交換をサポートした。

svn+ssh://svn.sourceforge.jp/svnroot/ttssh2/branches/ssh_ed25519
ブランチからマージ。

現時点でサポートしている機能は下記の通り。

 ・Key Generatorで ED25519 鍵の作成
 ・Key Generatorで RSA/DSA/ECDSA 秘密鍵ファイルに bcrypt KDF を選択可能。
 ・ED25519 による公開鍵認証ログイン
 ・RSA(bcrypt KDF) による公開鍵認証ログイン
 ・DSA(bcrypt KDF) による公開鍵認証ログイン
 ・ECDSA(bcrypt KDF) による公開鍵認証ログイン
 ・Host Keyに ssh-ed25519 のサポート


Revision 5284 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat May 25 03:58:15 2013 UTC (10 years, 9 months ago) by doda
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 34933 byte(s)
Diff to previous 5056
PKCS#8形式の鍵を読み込めなくなっていたのを修正。


Revision 5056 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Nov 2 13:24:06 2012 UTC (11 years, 4 months ago) by maya
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 35468 byte(s)
Diff to previous 4327
PuTTY 形式, SECSH 形式の SSH2 秘密鍵を読み込めるようにした

Revision 4327 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Feb 20 03:29:43 2011 UTC (13 years ago) by maya
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 13983 byte(s)
Diff to previous 4324
鍵形式・KEXアルゴリズム・ハッシュアルゴリズムのnid・暗号化方式のnidを変換する部分を関数にした

Revision 4324 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Feb 19 11:07:05 2011 UTC (13 years ago) by maya
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 14178 byte(s)
Diff to previous 4307
SSH2 の ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521 公開鍵認証をサポートした

Revision 4307 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 15 09:00:01 2011 UTC (13 years ago) by maya
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 13586 byte(s)
Diff to previous 3227
鍵の種類を増やせるように整理した
  enum hostkey_type を ssh_keytype にリネームした
機能が重複している構造体・コードを削除した
  CRYPTKeyPair を削除、Key を使うようにした
  key_from_blob を使うようにした

Revision 3227 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Mar 24 15:10:33 2009 UTC (14 years, 11 months ago) by maya
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 13829 byte(s)
Diff to previous 3221
CVS から SVN へ移行: 改行コードを LF から CR+LF へ変換

Revision 3221 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Mar 24 09:37:20 2009 UTC (14 years, 11 months ago) by maya
Original Path: trunk/ttssh2/ttxssh/keyfiles.c
File length: 13410 byte(s)
Diff to previous 3003
CVS から SVN へ移行: trunk に集約

Revision 3003 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 20 14:21:57 2007 UTC (16 years, 6 months ago) by maya
Original Path: ttssh2/trunk/ttxssh/keyfiles.c
File length: 13410 byte(s)
Diff to previous 2995
インデントを変更した。


Revision 2995 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Aug 15 04:03:26 2007 UTC (16 years, 6 months ago) by maya
Original Path: ttssh2/trunk/ttxssh/keyfiles.c
File length: 12606 byte(s)
Diff to previous 2994
$Log$ を削除した。


Revision 2994 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 13 22:30:03 2007 UTC (16 years, 6 months ago) by maya
Original Path: ttssh2/trunk/ttxssh/keyfiles.c
File length: 13429 byte(s)
Diff to previous 2992
国際化関数を修正した。
NO_I18N マクロを削除した。


Revision 2992 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Aug 8 16:04:09 2007 UTC (16 years, 7 months ago) by maya
Original Path: ttssh2/trunk/ttxssh/keyfiles.c
File length: 17153 byte(s)
Diff to previous 2980
安全な関数を使用するように変更した。


Revision 2980 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 6 14:10:12 2007 UTC (16 years, 9 months ago) by maya
Original Path: ttssh2/trunk/ttxssh/keyfiles.c
File length: 16341 byte(s)
Diff to previous 2962
プリプロセッサにより構造体が変わってしまうので、INET6 と I18N の #define を逆転させた。


Revision 2962 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Feb 17 16:20:21 2007 UTC (17 years ago) by yasuhide
Original Path: ttssh2/trunk/ttxssh/keyfiles.c
File length: 16136 byte(s)
Diff to previous 2939
SSH2 鍵を用いた認証でパスフレーズを間違えた際、パスフレーズダイアログにフォーカスを移す


Revision 2939 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 29 16:58:52 2006 UTC (17 years, 3 months ago) by maya
Original Path: ttssh2/trunk/ttxssh/keyfiles.c
File length: 16028 byte(s)
Diff to previous 2786
表示メッセージの読み込み対応


Revision 2786 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Feb 7 14:33:47 2005 UTC (19 years, 1 month ago) by yutakakn
Original Path: ttssh2/trunk/ttxssh/keyfiles.c
File length: 11399 byte(s)
Diff to previous 2769
ドットで始まるディレクトリにあるSSH2秘密鍵ファイルが読み込めない問題へ対処した。


Revision 2769 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Dec 27 14:35:41 2004 UTC (19 years, 2 months ago) by yutakakn
Original Path: ttssh2/trunk/ttxssh/keyfiles.c
File length: 11041 byte(s)
Diff to previous 2762
SSH2秘密鍵読み込み失敗時のエラーメッセージを強化した。


Revision 2762 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Dec 22 17:28:14 2004 UTC (19 years, 2 months ago) by yutakakn
Original Path: ttssh2/trunk/ttxssh/keyfiles.c
File length: 10803 byte(s)
Diff to previous 2729
SSH2公開鍵認証(RSA/DSA)をサポートした。


Revision 2729 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Nov 14 15:53:21 2004 UTC (19 years, 3 months ago) by yutakakn
Original Path: ttssh2/trunk/ttxssh/keyfiles.c
File length: 9102 byte(s)
Copied from: ttssh2/branches/avendor/ttxssh/keyfiles.c revision 2728
Diff to previous 2728
This commit was generated by cvs2svn to compensate for changes in r2,
which included commits to RCS files with non-trunk default branches.


Revision 2728 - (view) (download) (as text) (annotate) - [select for diffs]
Added Sun Nov 14 15:53:21 2004 UTC (19 years, 3 months ago) by yutakakn
Original Path: ttssh2/branches/avendor/ttxssh/keyfiles.c
File length: 9102 byte(s)
no message


This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26