Skip to content

Commit

Permalink
Merge branch 'release/2.5.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ktekinay
ktekinay committed Mar 22, 2020
2 parents 7202121 + 76bbfbf commit 308e949
Show file tree
Hide file tree
Showing 26 changed files with 1,797 additions and 505 deletions.
2 changes: 1 addition & 1 deletion CLI Harness/App.xojo_code
View file
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ Inherits ConsoleApplication
#tag Constant, Name = kPaddingPKCS, Type = String, Dynamic = False, Default = \"PKCS", Scope = Private
#tag EndConstant

#tag Constant, Name = kVersion, Type = String, Dynamic = False, Default = \"2.5.2", Scope = Private
#tag Constant, Name = kVersion, Type = String, Dynamic = False, Default = \"2.5.3", Scope = Private
#tag EndConstant


Expand Down
5 changes: 3 additions & 2 deletions CLI Harness/M_Crypto CLI Harness.xojo_project
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Type=Console
RBProjectVersion=2018.04
RBProjectVersion=2019.031
MinIDEVersion=20070100
OrigIDEVersion=00000000
Class=App;App.xojo_code;&h000000007908E7FF;&h0000000000000000;false
Module=M_ANSI;M_ANSI.xojo_code;&h0000000010F3A7FF;&h0000000000000000;false
Module=OptionParserModule;OptionParserModule.xojo_code;&h0000000025C327FF;&h0000000000000000;false
Expand Down Expand Up @@ -30,7 +31,7 @@ Class=ScryptUnitTester;../Shared Classes/Scrypt_MTC/ScryptUnitTester.xojo_code;&
Class=BadInputException;../Shared Classes/Scrypt_MTC/BadInputException.xojo_code;&h0000000028B777FF;&h0000000053BF77FF;false
MajorVersion=2
MinorVersion=5
SubVersion=2
SubVersion=3
NonRelease=0
Release=3
InfoVersion=
Expand Down
37 changes: 37 additions & 0 deletions Desktop Harness/DesktopTestController.xojo_code
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,86 +37,123 @@ Inherits TestController
#tag ViewBehavior
#tag ViewProperty
Name="AllTestCount"
Visible=false
Group="Behavior"
InitialValue=""
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Duration"
Visible=false
Group="Behavior"
InitialValue=""
Type="Double"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="FailedCount"
Visible=false
Group="Behavior"
InitialValue=""
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="GroupCount"
Visible=false
Group="Behavior"
InitialValue=""
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Index"
Visible=true
Group="ID"
InitialValue="-2147483648"
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="IsRunning"
Visible=false
Group="Behavior"
InitialValue=""
Type="Boolean"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Left"
Visible=true
Group="Position"
InitialValue="0"
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Name"
Visible=true
Group="ID"
InitialValue=""
Type="String"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="NotImplementedCount"
Visible=false
Group="Behavior"
InitialValue=""
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="PassedCount"
Visible=false
Group="Behavior"
InitialValue=""
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="RunGroupCount"
Visible=false
Group="Behavior"
InitialValue=""
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="RunTestCount"
Visible=false
Group="Behavior"
InitialValue=""
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="SkippedCount"
Visible=false
Group="Behavior"
InitialValue=""
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Super"
Visible=true
Group="ID"
InitialValue=""
Type="String"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Top"
Visible=true
Group="Position"
InitialValue="0"
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag EndViewBehavior
End Class
Expand Down
5 changes: 3 additions & 2 deletions Desktop Harness/M_Crypto Harness.xojo_project
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Type=Desktop
RBProjectVersion=2018.04
RBProjectVersion=2019.031
MinIDEVersion=20070100
OrigIDEVersion=00000000
Class=App;App.xojo_code;&h0000000014C611D3;&h0000000000000000;false
Window=WndLegacy;WndLegacy.xojo_window;&h0000000057BC7FF2;&h0000000000000000;false
Window=WndEncryption;WndEncryption.xojo_window;&h000000005F2A47FF;&h0000000000000000;false
Expand Down Expand Up @@ -58,7 +59,7 @@ Class=SHA512DigestTest;Tests/SHA512DigestTest.xojo_code;&h000000004DB86FFF;&h000
AppMenuBar=MenuBar1
MajorVersion=2
MinorVersion=5
SubVersion=2
SubVersion=3
NonRelease=0
Release=3
InfoVersion=
Expand Down
11 changes: 10 additions & 1 deletion Desktop Harness/SHA256Digest_MTC.xojo_code
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ Protected Class SHA256Digest_MTC
#tag Constant, Name = kLastRoundIndex, Type = Double, Dynamic = False, Default = \"63", Scope = Private
#tag EndConstant

#tag Constant, Name = kVersion, Type = String, Dynamic = False, Default = \"2.5.2", Scope = Public
#tag Constant, Name = kVersion, Type = String, Dynamic = False, Default = \"2.5.3", Scope = Public
#tag EndConstant


Expand All @@ -373,38 +373,47 @@ Protected Class SHA256Digest_MTC
Name="Name"
Visible=true
Group="ID"
InitialValue=""
Type="String"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Index"
Visible=true
Group="ID"
InitialValue="-2147483648"
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Super"
Visible=true
Group="ID"
InitialValue=""
Type="String"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Left"
Visible=true
Group="Position"
InitialValue="0"
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Top"
Visible=true
Group="Position"
InitialValue="0"
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Value"
Visible=false
Group="Behavior"
InitialValue=""
Type="String"
EditorType="MultiLineEditor"
#tag EndViewProperty
Expand Down
11 changes: 10 additions & 1 deletion Desktop Harness/SHA512Digest_MTC.xojo_code
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Protected Class SHA512Digest_MTC
#tag Constant, Name = kLastRoundIndex, Type = Double, Dynamic = False, Default = \"79", Scope = Private
#tag EndConstant

#tag Constant, Name = kVersion, Type = String, Dynamic = False, Default = \"2.5.2", Scope = Public
#tag Constant, Name = kVersion, Type = String, Dynamic = False, Default = \"2.5.3", Scope = Public
#tag EndConstant


Expand All @@ -376,38 +376,47 @@ Protected Class SHA512Digest_MTC
Name="Name"
Visible=true
Group="ID"
InitialValue=""
Type="String"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Index"
Visible=true
Group="ID"
InitialValue="-2147483648"
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Super"
Visible=true
Group="ID"
InitialValue=""
Type="String"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Left"
Visible=true
Group="Position"
InitialValue="0"
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Top"
Visible=true
Group="Position"
InitialValue="0"
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Value"
Visible=false
Group="Behavior"
InitialValue=""
Type="String"
EditorType="MultiLineEditor"
#tag EndViewProperty
Expand Down
Loading

0 comments on commit 308e949

Please sign in to comment.