* forgot some conflicts :(

fcl/inc/idea.pp

@@ -60,11 +60,7 @@ TYPE IDEAkey = ARRAY[0..keylen-1] OF Word;
 
 PROCEDURE EnKeyIdea(userkey: ideacryptkey; VAR z: ideakey);
 PROCEDURE DeKeyIdea(z: IDEAKey; VAR dk: ideakey);
-<<<<<<< idea.pp
-PROCEDURE CipherIdea(input: ideacryptdata; VAR output: ideacryptdata; z: IDEAkey);
-=======
 PROCEDURE CipherIdea(input: ideacryptdata; VAR outdata: ideacryptdata; z: IDEAkey);
->>>>>>> 1.1.2.2
 
 Type
 
@@ -219,12 +215,7 @@ BEGIN
   FOR j := 0 TO 51 DO z[j] := 0;
 END;
 
-<<<<<<< idea.pp
-PROCEDURE CipherIdea(input: ideacryptdata; VAR output: ideacryptdata; z:
-=======
-PROCEDURE CipherIdea(input: ideacryptdata; VAR outdata: ideacryptdata; z:
->>>>>>> 1.1.2.2
-IDEAkey);
+PROCEDURE CipherIdea(input: ideacryptdata; VAR outdata: ideacryptdata; z:IDEAkey);
 VAR x1, x2, x3, x4, t1, t2: Word;
     r: Integer;
     zi: Integer;
@@ -251,21 +242,11 @@ BEGIN
     x3 := t2;
   END;
   mul(x1, z[zi]);       Inc(zi);
-<<<<<<< idea.pp
-  output[0] := x1;
-  output[1] := x3 + z[zi]; Inc(zi);
-  output[2] := x2 + z[zi]; Inc(zi);
-=======
   outdata[0] := x1;
   outdata[1] := x3 + z[zi]; Inc(zi);
   outdata[2] := x2 + z[zi]; Inc(zi);
->>>>>>> 1.1.2.2
   Mul(x4,z[zi]);
-<<<<<<< idea.pp
-  output[3] := x4;
-=======
   outdata[3] := x4;
->>>>>>> 1.1.2.2
   FOR r := 0 TO 3 DO input[r] := 0;
   FOR r := 0 TO 51 DO z[r] := 0;
 END;
@@ -434,7 +415,10 @@ END.
 
 {
   $Log$
-  Revision 1.4  2000-08-04 21:47:29  peter
+  Revision 1.5  2000-08-04 21:48:29  peter
+    * forgot some conflicts :(
+
+  Revision 1.4  2000/08/04 21:47:29  peter
     * applied patch from Paul te Bokkel (merged)
 
   Revision 1.3  2000/07/14 19:47:36  michael