[Ttssh2-commit] [9248] 関数の途中で変数宣言したせいでビルドできない問題を修正

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2021年 5月 13日 (木) 22:02:31 JST


Revision: 9248
          https://osdn.net/projects/ttssh2/scm/svn/commits/9248
Author:   nmaya
Date:     2021-05-13 22:02:31 +0900 (Thu, 13 May 2021)
Log Message:
-----------
関数の途中で変数宣言したせいでビルドできない問題を修正

Modified Paths:
--------------
    branches/ssh_chacha20poly1305/ttssh2/ttxssh/keyfiles.c

-------------- next part --------------
Modified: branches/ssh_chacha20poly1305/ttssh2/ttxssh/keyfiles.c
===================================================================
--- branches/ssh_chacha20poly1305/ttssh2/ttxssh/keyfiles.c	2021-05-10 14:36:37 UTC (rev 9247)
+++ branches/ssh_chacha20poly1305/ttssh2/ttxssh/keyfiles.c	2021-05-13 13:02:31 UTC (rev 9248)
@@ -810,6 +810,8 @@
 	int i, len, len2;
 	char *encname = NULL, *comment = NULL, *private_mac = NULL;
 	buffer_t *pubkey = NULL, *prikey = NULL;
+	const struct ssh2cipher *cipher = NULL;
+	struct sshcipher_ctx *cc = NULL;
 
 	result = (Key *)malloc(sizeof(Key));
 	ZeroMemory(result, sizeof(Key)); 
@@ -818,9 +820,6 @@
 	result->dsa = NULL;
 	result->ecdsa = NULL;
 
-	const struct ssh2cipher *cipher = NULL;
-	struct sshcipher_ctx *cc = NULL;
-
 	pubkey = buffer_init();
 	prikey = buffer_init();
 
@@ -1390,6 +1389,8 @@
 	int encflag;
 	char *encname = NULL;
 	buffer_t *blob = NULL, *blob2 = NULL;
+	const struct ssh2cipher *cipher = NULL;
+	struct sshcipher_ctx *cc = NULL;
 
 	result = (Key *)malloc(sizeof(Key));
 	ZeroMemory(result, sizeof(Key)); 
@@ -1401,9 +1402,6 @@
 	blob = buffer_init();
 	blob2 = buffer_init();
 
-	const struct ssh2cipher *cipher = NULL;
-	struct sshcipher_ctx *cc = NULL;
-
 	// parse keyfile & decode blob
 	{
 	char line[200], buf[100];


Ttssh2-commit メーリングリストの案内
Back to archive index