commit 0ff6b2ab3058987fa55ba3da01d8fc31bb38da32
parent 8fa6c9e044b49858905bed321ddbff0844090c25
Author: Minerva_juppiter <94231606+minerva-jupiter@users.noreply.github.com>
Date: Mon, 27 Jun 2022 23:52:36 +0900
Diffstat:
3 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/Encrypt.cs b/Encrypt.cs
@@ -14,14 +14,11 @@ namespace Cypher
//変数宣言
int[] order = new int[100];
- string written;
string[] date = new string[100];
int quotient; //商
int amari = 0; //あまり
int inNumber = 0; //入力データ番号
int arrayNumber = 0; //配列番号
- int chapter = 0;
- int f = 0;
byte[] eByte = new byte[1];
@@ -58,7 +55,6 @@ namespace Cypher
byte[] encrypted = new byte[bs.Length];
- //ここまでテスト完了
int indexNumuber;
int indexEnd;
int indexStart;
@@ -88,7 +84,7 @@ namespace Cypher
amari = bs.Length - quotient * 99;
int where99 = Array.IndexOf(order, 99);
- while (arrayNumber < 99)
+ while (arrayNumber < 100)
{
indexNumuber = Array.IndexOf(order, arrayNumber);
if (indexNumuber < where99)
@@ -98,8 +94,8 @@ namespace Cypher
}
else if (indexNumuber == where99)
{
- indexStart = where99 * quotient;
- indexEnd = (where99 + 1) * quotient;
+ indexStart = indexNumuber * quotient;
+ indexEnd = indexNumuber * quotient + amari;
}
else
{
@@ -115,15 +111,16 @@ namespace Cypher
outNumber++;
inNumber++;
}
+
arrayNumber++;
}
- //書きこ
- File.WriteAllBytes(whereEncryptedFile, encrypted);
- Console.WriteLine("Encrypt was ended.");
- Console.WriteLine("The date key is " + encrypted.Length + ".");
- Console.WriteLine("You have to remember it!");
}
+ //書きこ
+ File.WriteAllBytes(whereEncryptedFile, encrypted);
+ Console.WriteLine("Encrypt was ended.");
+ Console.WriteLine("The date key is " + encrypted.Length + ".");
+ Console.WriteLine("You have to remember it!");
}
}
diff --git a/SortProgram.cs b/SortProgram.cs
@@ -14,8 +14,6 @@ namespace Cypher
//変数宣言
int[] order = new int[100];
- string[] written = new string[100];
- string writtens;
int inNumber = 0;
//質問
@@ -61,18 +59,19 @@ namespace Cypher
multipleJudgment = false;
}
+ //ReadkeyFile
ResdFiles resdFiles = new ResdFiles();
order = resdFiles.ReadKeyFile(whereKeyFile);
- //順番にデータを移行
+ //Read Encrypted File
inNumber = 0;
- //encrypted の読み込み
FileStream fs = new FileStream(whereEncrypted, FileMode.Open);
byte[] encrypted = new byte[fs.Length];
fs.Read(encrypted, 0, encrypted.Length);
fs.Close();
Console.WriteLine("Encrypted date was readed");
+ //sort
inNumber = 0;
int arreyNumber = 0;
int indexNumber = 0;
@@ -92,12 +91,12 @@ namespace Cypher
indexEndNumber = (indexNumber + 1) * quotient;
//参照して"written"に代入
- indexNumber = indexStartNumber;
+ outNumber = indexStartNumber;
while (indexNumber < indexEndNumber)
{
- sorded[inNumber] = encrypted[indexNumber];
+ sorded[inNumber] = encrypted[outNumber];
indexNumber++;
- inNumber++;
+ outNumber++;
}
Console.WriteLine(arreyNumber);
arreyNumber++;
@@ -111,7 +110,7 @@ namespace Cypher
while (arreyNumber < 100)
{
- indexNumber = Array.IndexOf(order, arreyNumber);
+ indexNumber = Array.IndexOf(order, arreyNumber); //inNumber 80
//indexNumberとamariの関係で場合分け
if (indexNumber < whereAmari)
{
@@ -124,7 +123,7 @@ namespace Cypher
indexStartNumber = indexNumber * quotient;
indexEndNumber = indexNumber * quotient + amari;
}
- else if (indexNumber < whereAmari)
+ else
{
indexStartNumber = (indexNumber - 1) * quotient + amari;
indexEndNumber = indexNumber * quotient + amari;
diff --git a/test.cs b/test.cs
@@ -14,11 +14,6 @@ namespace Cypher
}
-
-
-
-
-
public void Writedate(byte[] date)
{
int inNumber = 0;