paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 09:29:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from Ilya Melnikov to change var to out params (bug 20949)

Browse Source 
git-svn-id: trunk@19905 -
This commit is contained in:
michael 2011-12-29 11:50:12 +00:00
parent 109fa89bc8
commit 51b5107247
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/fcl-base/src/idea.pp
View File

@ -64,9 +64,9 @@ TYPE
IdeaCryptKey = TIdeaCryptKey; IdeaCryptKey = TIdeaCryptKey;
IdeaCryptData = TIdeaCryptData; IdeaCryptData = TIdeaCryptData;
PROCEDURE EnKeyIdea(UserKey: TIdeacryptkey; VAR z: TIDEAKey); PROCEDURE EnKeyIdea(UserKey: TIdeacryptkey; OUT z: TIDEAKey);
PROCEDURE DeKeyIdea(z: TIDEAKey; VAR dk: TIDEAKey); PROCEDURE DeKeyIdea(z: TIDEAKey; OUT dk: TIDEAKey);
PROCEDURE CipherIdea(Input: TIDEACryptData; VAR outdata: TIDEACryptData; z: TIDEAKey); PROCEDURE CipherIdea(Input: TIDEACryptData; OUT outdata: TIDEACryptData; z: TIDEAKey);
Type Type
EIDEAError = Class(EStreamError); EIDEAError = Class(EStreamError);
@ -82,7 +82,7 @@ Type
Protected Protected
function GetPosition: Int64; override; function GetPosition: Int64; override;
procedure InvalidSeek; override; procedure InvalidSeek; override;
Procedure CreateCryptKey(Const S : String; Var Key : TIDEACryptKey); Procedure CreateCryptKey(Const S : String; Out Key : TIDEACryptKey);
Public Public
Constructor Create(AKey : TIDEAKey; Dest: TStream); overload; Constructor Create(AKey : TIDEAKey; Dest: TStream); overload;
Property Key : TIDEAKey Read FKey; Property Key : TIDEAKey Read FKey;
@ -157,7 +157,7 @@ BEGIN
inv := word(1-t1); inv := word(1-t1);
END; END;
PROCEDURE EnKeyIdea(userkey: ideacryptkey; VAR z: ideakey); PROCEDURE EnKeyIdea(userkey: ideacryptkey; OUT z: ideakey);
VAR zi,i,j: integer; VAR zi,i,j: integer;
BEGIN BEGIN
FOR j := 0 TO 7 DO z[j] := userkey[j]; FOR j := 0 TO 7 DO z[j] := userkey[j];
@ -172,7 +172,7 @@ BEGIN
FOR i := 0 TO 7 DO userkey[i] := 0; FOR i := 0 TO 7 DO userkey[i] := 0;
END; END;
PROCEDURE DeKeyIdea(z: IDEAKey; VAR dk: ideakey); PROCEDURE DeKeyIdea(z: IDEAKey; OUT dk: ideakey);
VAR j: Integer; VAR j: Integer;
t1,t2,t3: Word; t1,t2,t3: Word;
p: IDEAKey; p: IDEAKey;
@ -218,7 +218,7 @@ BEGIN
FOR j := 0 TO 51 DO z[j] := 0; FOR j := 0 TO 51 DO z[j] := 0;
END; END;
PROCEDURE CipherIdea(input: ideacryptdata; VAR outdata: ideacryptdata; z:IDEAkey); PROCEDURE CipherIdea(input: ideacryptdata; OUT outdata: ideacryptdata; z:IDEAkey);
VAR x1, x2, x3, x4, t1, t2: Word; VAR x1, x2, x3, x4, t1, t2: Word;
r: Integer; r: Integer;
zi: Integer; zi: Integer;
@ -278,7 +278,7 @@ begin
Raise EIDEAError.Create(SNoSeekAllowed); Raise EIDEAError.Create(SNoSeekAllowed);
end; end;
procedure TIDEAStream.CreateCryptKey(const S: String; var Key: TIDEACryptKey); procedure TIDEAStream.CreateCryptKey(const S: String; out Key: TIDEACryptKey);
Var Var
KLen : Integer; KLen : Integer;