rebuilt release

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7641 8c9fc860-2736-0410-a75d-ab315db34111

WinAos/obg/CryptoDES.SymW

@@ -1,11 +1,20 @@
 MODULE CryptoDES;
 	IMPORT S := SYSTEM, U := CryptoUtils, Ciphers := CryptoCiphers;
 CONST 
+	Mask01 = S.VAL(SET, 0AAAAAAAAH); 
+	Mask02 = S.VAL(SET, 858993459); 
+	Mask04 = S.VAL(SET, 252645135); 
+	Mask08 = S.VAL(SET, 16711935); 
+	Mask16 = S.VAL(SET, 65535); 
 TYPE 
 	Sandbox = ARRAY 64 OF SET; 
 
 	BitSwap = ARRAY 16 OF SET; 
 
+	Ind4* = RECORD 
+		a-, b-, c-, d-: LONGINT; 
+	END; 
+
 	Cipher* = OBJECT (Ciphers.Cipher)
 	VAR 
 		ske, skd: ARRAY 32 OF SET; 
@@ -24,6 +33,13 @@ VAR
 	sb1-, sb2-, sb3-, sb4-, sb5-, sb6-, sb7-, sb8-: Sandbox; 
 	LHs, RHs: BitSwap; 
 
+	PROCEDURE  - Split*(x: SET; VAR i4: Ind4);
+	BEGIN
+		i4.a := (S.VAL(LONGINT, x) MOD 64); 
+		i4.b := ((S.VAL(LONGINT, x) DIV 256) MOD 64); 
+		i4.c := ((S.VAL(LONGINT, x) DIV 65536) MOD 64); 
+		i4.d := ((S.VAL(LONGINT, x) DIV 16777216) MOD 64)
+	END Split; 
 	PROCEDURE ^ NewCipher*(): Ciphers.Cipher; 
 	PROCEDURE ^ IP*(VAR x, y: SET); 
 	PROCEDURE ^ FP*(VAR x, y: SET); 

WinAos/obg/CryptoDES3.SymW

@@ -1,5 +1,5 @@
 MODULE CryptoDES3;
-	IMPORT Ciphers := CryptoCiphers, U := CryptoUtils, DES := CryptoDES, S := SYSTEM;
+	IMPORT Ciphers := CryptoCiphers, U := CryptoUtils, D := CryptoDES;
 CONST 
 TYPE 
 	Cipher* = OBJECT (Ciphers.Cipher)

WinAos/obg/CryptoTwofish.SymW

@@ -2,11 +2,15 @@ MODULE CryptoTwofish;
 	IMPORT S := SYSTEM, Ciphers := CryptoCiphers, U := CryptoUtils;
 CONST 
 	N = 16; 
+	FDBK = 361; 
+	Fdbk2 = S.VAL(SET, (FDBK DIV 2)); 
+	Fdbk4 = S.VAL(SET, (FDBK DIV 4)); 
+	Byte0 = S.VAL(SET, 255); 
+	S14d = S.VAL(SET, 333); 
+	S0a6 = S.VAL(SET, 166); 
 TYPE 
 	Block = ARRAY 4 OF SET; 
 
-	LI = LONGINT; 
-
 	SKey = ARRAY 4 OF SET; 
 
 	Cipher* = OBJECT (Ciphers.Cipher)
@@ -25,14 +29,19 @@ TYPE
 		PROCEDURE ^  & Init*; 
 	END Cipher; 
 VAR 
-	tab: ARRAY 2 OF ARRAY 256 OF SET; 
+	tab0: ARRAY 256 OF SET; 
+	tab1: ARRAY 256 OF SET; 
 
 	PROCEDURE ^ NewCipher*(): Ciphers.Cipher; 
 	PROCEDURE ^ m1(x: LONGINT): SET; 
 	PROCEDURE ^ mx(x: LONGINT): SET; 
 	PROCEDURE ^ my(x: LONGINT): SET; 
 	PROCEDURE ^ split(x: LONGINT; VAR v: SKey); 
-	PROCEDURE ^ f32(x: LONGINT; CONST k32: ARRAY OF LONGINT; keybits: LONGINT): LONGINT; 
+	PROCEDURE  - Int(x: SET): LONGINT;
+	BEGIN
+		RETURN S.VAL(LONGINT, x)
+	END Int; 
+	PROCEDURE ^ F32(x: SET; CONST k32: ARRAY OF LONGINT; keybits: LONGINT): LONGINT; 
 	PROCEDURE ^ Encode(k0, k1: LONGINT): LONGINT; 
 	PROCEDURE ^ Init0; 
 BEGIN

WinAos/obg/Files.SymW

@@ -31,6 +31,8 @@ CONST
 	SetSize = (MAX(SET) + 1); 
 	NeedsPrefix* = 0; 
 TYPE 
+	TSize* = Streams.TSize; 
+
 	FileName* = ARRAY (PrefixLength + NameLength) OF CHAR; 
 
 	Rider* = RECORD 

WinAos/obg/FoxIntermediateBackend.SymW

@@ -31,6 +31,7 @@ CONST
 	NegativeDivisorTrap* = 12; 
 	NoReturnTrap* = 16; 
 	NilPointerTrap* = 17; 
+	RethrowTrap* = 18; 
 	Trace = FALSE; 
 	TraceRegisterUsageCount = TRUE; 
 	ArrayAlignment = (8 * 8); 

WinAos/obg/OdUtil.SymW

@@ -36,7 +36,7 @@ TYPE
 		PROCEDURE ^ InternalString*(VAR x: ARRAY OF CHAR); 
 		PROCEDURE ^ String*(x: ARRAY OF CHAR); 
 		PROCEDURE ^ Hex*(x, w: LONGINT); 
-		PROCEDURE ^ Int*(x, w: LONGINT); 
+		PROCEDURE ^ Int*(x: HUGEINT; w: LONGINT); 
 		PROCEDURE ^ TimeStamp*; 
 		PROCEDURE ^ Close*; 
 	END Log; 

WinAos/obg/Streams.SymW

@@ -13,6 +13,8 @@ CONST
 	TAB = 9X; 
 	SP = 20X; 
 TYPE 
+	TSize* = LONGINT; 
+
 	Sender* = PROCEDURE {DELEGATE}(CONST buf: ARRAY OF CHAR; ofs, len: LONGINT; propagate: BOOLEAN; VAR res: LONGINT); 
 
 	Receiver* = PROCEDURE {DELEGATE}(VAR buf: ARRAY OF CHAR; ofs, size, min: LONGINT; VAR len, res: LONGINT); 

WinAos/obg/Strings.SymW

@@ -56,7 +56,7 @@ VAR
 	PROCEDURE ^ IsPrintable*(ch: CHAR): BOOLEAN; 
 	PROCEDURE ^ BoolToStr*(b: BOOLEAN; VAR s: ARRAY OF CHAR); 
 	PROCEDURE ^ StrToBool*(CONST s: ARRAY OF CHAR; VAR b: BOOLEAN); 
-	PROCEDURE ^ IntToStr*(i: LONGINT; VAR s: ARRAY OF CHAR); 
+	PROCEDURE ^ IntToStr*(x: HUGEINT; VAR s: ARRAY OF CHAR); 
 	PROCEDURE ^ StrToInt*(CONST str: ARRAY OF CHAR; VAR val: LONGINT); 
 	PROCEDURE ^ StrToIntPos*(CONST str: ARRAY OF CHAR; VAR val, i: LONGINT); 
 	PROCEDURE ^ IntToHexStr*(h: HUGEINT; width: LONGINT; VAR s: ARRAY OF CHAR); 

WinAos/obg/TFLog.SymW

@@ -30,7 +30,7 @@ TYPE
 		PROCEDURE ^ InternalString*(VAR x: ARRAY OF CHAR); 
 		PROCEDURE ^ String*(x: ARRAY OF CHAR); 
 		PROCEDURE ^ Hex*(x, w: LONGINT); 
-		PROCEDURE ^ Int*(x, w: LONGINT); 
+		PROCEDURE ^ Int*(x: HUGEINT; w: LONGINT); 
 		PROCEDURE ^ TimeStamp*; 
 		PROCEDURE ^ Close*; 
 	END Log;