From aaa38972354a39234aaf171f0848287a62df0b5f Mon Sep 17 00:00:00 2001
From: Gaute Hope <eg@gaute.vetsj.com>
Date: Sat, 13 Nov 2010 11:42:37 +0100
Subject: [PATCH] bruk statisk key

---
 energimaaling.userprefs |  6 +++---
 tcpkomm/TCPMelding.cs   | 30 ++++++++++++++----------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/energimaaling.userprefs b/energimaaling.userprefs
index 58a028d..ed7e0fb 100644
--- a/energimaaling.userprefs
+++ b/energimaaling.userprefs
@@ -1,15 +1,15 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" ctype="Workspace" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="hustest/Main.cs" ctype="Workbench">
+  <MonoDevelop.Ide.Workbench ActiveDocument="sentral/PdaInstans.cs" ctype="Workbench">
     <Files>
-      <File FileName="tcpkomm/TCPMelding.cs" Line="128" Column="4" />
+      <File FileName="tcpkomm/TCPMelding.cs" Line="254" Column="12" />
       <File FileName="hustest/Main.cs" Line="72" Column="5" />
       <File FileName="sentral/HusKontroll.cs" Line="131" Column="2" />
       <File FileName="sentral/HusInstans.cs" Line="62" Column="5" />
       <File FileName="sentral/Hus.cs" Line="3" Column="1" />
       <File FileName="sentral/PdaKontroll.cs" Line="9" Column="1" />
       <File FileName="sentral/Main.cs" Line="10" Column="2" />
-      <File FileName="sentral/PdaInstans.cs" Line="141" Column="32" />
+      <File FileName="sentral/PdaInstans.cs" Line="80" Column="23" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/tcpkomm/TCPMelding.cs b/tcpkomm/TCPMelding.cs
index 3846c09..d8878d9 100644
--- a/tcpkomm/TCPMelding.cs
+++ b/tcpkomm/TCPMelding.cs
@@ -255,26 +255,24 @@ namespace energimaaling
 		public static Rijndael ralg;
 		
 		public static void loadkeys () {
-			log ("Laster Rijndael nøkkel..");
+			log ("Laster Rijndaelll nøkkel..");
 			try {
-				FileStream fiv = File.OpenRead ("iv.bin");
-				FileStream fkey = File.OpenRead ("key.bin");
-				
-				BinaryReader b = new BinaryReader (fiv);
-				IV = b.ReadBytes (16);
-				
-				b = new BinaryReader (fkey);
-				KEY = b.ReadBytes (32);
-				
-				ralg = Rijndael.Create ();
-				ralg.Key = KEY;
-				ralg.IV = IV;
+				/*
+				 * PDA har tydeligvis problem med å laste fra fil so vi legg den inn manuelt foreløpig.
+				 * 
+				 * Det betyr at genkeys har ingen funksjon no; og du treng ikkje key.bin og iv.bin
+				 * 
+				 */
+				
+                byte[] key = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 };
+                byte[] iv = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; 
+                ralg = Rijndael.Create();
+				ralg.Key = key;
+				ralg.IV = iv;
 				ralg.Padding = PaddingMode.PKCS7;
 				
 				keyloaded = true;
-				
-				fkey.Close ();
-				fiv.Close ();
+
 			} catch {
 				log ("FEIL! Kunne ikkje laste nøkkel.");	
 				keyloaded = false;
-- 
2.11.4.GIT