woollybah 6 лет назад
Родитель
Сommit
63db65e103

+ 4 - 4
crc32.mod/crc32.bmx

@@ -39,14 +39,14 @@ Type TCRC32 Extends TMessageDigest
 		digestPtr = bmx_digest_crc32_init()
 		digestPtr = bmx_digest_crc32_init()
 	End Method
 	End Method
 
 
-	Method OutBytes:Int()
+	Method OutBytes:Int() Override
 		Return 4
 		Return 4
 	End Method
 	End Method
 	
 	
 	Rem
 	Rem
 	bbdoc: Updates the calculation with @dataLen bytes of data.
 	bbdoc: Updates the calculation with @dataLen bytes of data.
 	End Rem
 	End Rem
-	Method Update:Int(data:Byte Ptr, dataLen:Int)
+	Method Update:Int(data:Byte Ptr, dataLen:Int) Override
 		bmx_digest_crc32_update(digestPtr, data, dataLen)
 		bmx_digest_crc32_update(digestPtr, data, dataLen)
 	End Method
 	End Method
 
 
@@ -83,7 +83,7 @@ Type TCRC32 Extends TMessageDigest
 	bbdoc: Finishes calculation and produces the result, filling @result with the calculated bytes.
 	bbdoc: Finishes calculation and produces the result, filling @result with the calculated bytes.
 	about: The state is reset, ready to create a new calculation.
 	about: The state is reset, ready to create a new calculation.
 	End Rem
 	End Rem
-	Method Finish:Int(result:Byte[])
+	Method Finish:Int(result:Byte[]) Override
 		Assert result.length >= 4, "Byte array must be at least 4 bytes."
 		Assert result.length >= 4, "Byte array must be at least 4 bytes."
 		bmx_digest_crc32_finish(digestPtr, result, 4)
 		bmx_digest_crc32_finish(digestPtr, result, 4)
 	End Method
 	End Method
@@ -106,7 +106,7 @@ Type TCRC32Register Extends TDigestRegister
 		End If
 		End If
 	End Method
 	End Method
 
 
-	Method ToString:String()
+	Method ToString:String() Override
 		Return "CRC32"
 		Return "CRC32"
 	End Method
 	End Method
 
 

+ 15 - 15
crypto.mod/crypto.bmx

@@ -111,7 +111,7 @@ Type TCryptoKey
 	Rem
 	Rem
 	bbdoc: Returns a String representation of the key.
 	bbdoc: Returns a String representation of the key.
 	End Rem
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return TBase64.Encode(key)
 		Return TBase64.Encode(key)
 	End Method
 	End Method
 	
 	
@@ -138,7 +138,7 @@ Type TCryptoHashKey Extends TCryptoKey
 	Rem
 	Rem
 	bbdoc: Retrieves a key from its String representation.
 	bbdoc: Retrieves a key from its String representation.
 	End Rem
 	End Rem
-	Function FromString:TCryptoHashKey(key:String)
+	Function FromString:TCryptoHashKey(key:String) Override
 		Local hashKey:TCryptoHashKey = New TCryptoHashKey
 		Local hashKey:TCryptoHashKey = New TCryptoHashKey
 		hashKey.key = TBase64.Decode(key)
 		hashKey.key = TBase64.Decode(key)
 
 
@@ -298,7 +298,7 @@ Type TCryptoSecretBoxKey Extends TCryptoKey
 	Rem
 	Rem
 	bbdoc: Retrieves a key from its String representation.
 	bbdoc: Retrieves a key from its String representation.
 	End Rem
 	End Rem
-	Function FromString:TCryptoSecretBoxKey(key:String)
+	Function FromString:TCryptoSecretBoxKey(key:String) Override
 		Local sbKey:TCryptoSecretBoxKey = New TCryptoSecretBoxKey
 		Local sbKey:TCryptoSecretBoxKey = New TCryptoSecretBoxKey
 		sbKey.key = TBase64.Decode(key)
 		sbKey.key = TBase64.Decode(key)
 
 
@@ -481,7 +481,7 @@ Type TCryptoSignKeyPair
 	Rem
 	Rem
 	bbdoc: Returns a String representation of the key pair.
 	bbdoc: Returns a String representation of the key pair.
 	End Rem
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return PublicKeyToString() + "." + SecretKeyToString()
 		Return PublicKeyToString() + "." + SecretKeyToString()
 	End Method
 	End Method
 	
 	
@@ -562,7 +562,7 @@ Type TCryptoSignature
 	Rem
 	Rem
 	bbdoc: Returns a String representation of the signature.
 	bbdoc: Returns a String representation of the signature.
 	End Rem
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return TBase64.Encode(signature, 0, EBase64Options.DontBreakLines)
 		Return TBase64.Encode(signature, 0, EBase64Options.DontBreakLines)
 	End Method
 	End Method
 	
 	
@@ -703,7 +703,7 @@ Type TCryptoExchangeKeyPair
 	Rem
 	Rem
 	bbdoc: Returns a String representation of the key pair.
 	bbdoc: Returns a String representation of the key pair.
 	End Rem
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return PublicKeyToString() + "." + SecretKeyToString()
 		Return PublicKeyToString() + "." + SecretKeyToString()
 	End Method
 	End Method
 	
 	
@@ -797,7 +797,7 @@ Type TCryptoSessionKeyPair
 	Rem
 	Rem
 	bbdoc: Returns a String representation of the key pair.
 	bbdoc: Returns a String representation of the key pair.
 	End Rem
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return RxToString() + "." + TxToString()
 		Return RxToString() + "." + TxToString()
 	End Method
 	End Method
 	
 	
@@ -879,7 +879,7 @@ Type TCryptoNPacket
 	Rem
 	Rem
 	bbdoc: Returns a string representation of the packet.
 	bbdoc: Returns a string representation of the packet.
 	End Rem
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return TBase64.Encode(packet)
 		Return TBase64.Encode(packet)
 	End Method
 	End Method
 	
 	
@@ -909,7 +909,7 @@ Type TCryptoKK1Packet
 	Rem
 	Rem
 	bbdoc: Returns a string representation of the packet.
 	bbdoc: Returns a string representation of the packet.
 	End Rem
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return TBase64.Encode(packet)
 		Return TBase64.Encode(packet)
 	End Method
 	End Method
 	
 	
@@ -939,7 +939,7 @@ Type TCryptoKK2Packet
 	Rem
 	Rem
 	bbdoc: Returns a string representation of the packet.
 	bbdoc: Returns a string representation of the packet.
 	End Rem
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return TBase64.Encode(packet)
 		Return TBase64.Encode(packet)
 	End Method
 	End Method
 	
 	
@@ -969,7 +969,7 @@ Type TCryptoXX1Packet
 	Rem
 	Rem
 	bbdoc: Returns a string representation of the packet.
 	bbdoc: Returns a string representation of the packet.
 	End Rem
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return TBase64.Encode(packet)
 		Return TBase64.Encode(packet)
 	End Method
 	End Method
 	
 	
@@ -999,7 +999,7 @@ Type TCryptoXX2Packet
 	Rem
 	Rem
 	bbdoc: Returns a string representation of the packet.
 	bbdoc: Returns a string representation of the packet.
 	End Rem
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return TBase64.Encode(packet)
 		Return TBase64.Encode(packet)
 	End Method
 	End Method
 	
 	
@@ -1029,7 +1029,7 @@ Type TCryptoXX3Packet
 	Rem
 	Rem
 	bbdoc: Returns a string representation of the packet.
 	bbdoc: Returns a string representation of the packet.
 	End Rem
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return TBase64.Encode(packet)
 		Return TBase64.Encode(packet)
 	End Method
 	End Method
 	
 	
@@ -1274,7 +1274,7 @@ Type TCryptoPWHashMasterKey
 	Rem
 	Rem
 	bbdoc: Returns a String representation of the key.
 	bbdoc: Returns a String representation of the key.
 	End Rem
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return TBase64.Encode(key)
 		Return TBase64.Encode(key)
 	End Method
 	End Method
 	
 	
@@ -1307,7 +1307,7 @@ Type TCryptoPWHashStoredKey
 	Rem
 	Rem
 	bbdoc: Returns a String representation of the key.
 	bbdoc: Returns a String representation of the key.
 	End Rem
 	End Rem
-	Method ToString:String()
+	Method ToString:String() Override
 		Return TBase64.Encode(key, 0, EBase64Options.DontBreakLines)
 		Return TBase64.Encode(key, 0, EBase64Options.DontBreakLines)
 	End Method
 	End Method
 	
 	

+ 4 - 4
md5digest.mod/md5digest.bmx

@@ -39,14 +39,14 @@ Type TMD5 Extends TMessageDigest
 		digestPtr = bmx_digest_md5_init()
 		digestPtr = bmx_digest_md5_init()
 	End Method
 	End Method
 
 
-	Method OutBytes:Int()
+	Method OutBytes:Int() Override
 		Return 16
 		Return 16
 	End Method
 	End Method
 	
 	
 	Rem
 	Rem
 	bbdoc: Updates the hash with @dataLen bytes of data.
 	bbdoc: Updates the hash with @dataLen bytes of data.
 	End Rem
 	End Rem
-	Method Update:Int(data:Byte Ptr, dataLen:Int)
+	Method Update:Int(data:Byte Ptr, dataLen:Int) Override
 		Return bmx_digest_md5_process(digestPtr, data, dataLen)
 		Return bmx_digest_md5_process(digestPtr, data, dataLen)
 	End Method
 	End Method
 	
 	
@@ -54,7 +54,7 @@ Type TMD5 Extends TMessageDigest
 	bbdoc: Finishes hashing and produces the digest, filling @digest with the hashed bytes.
 	bbdoc: Finishes hashing and produces the digest, filling @digest with the hashed bytes.
 	about: The hashing state is reset, ready to create a new digest.
 	about: The hashing state is reset, ready to create a new digest.
 	End Rem
 	End Rem
-	Method Finish:Int(digest:Byte[])
+	Method Finish:Int(digest:Byte[]) Override
 		Assert digest.length >= 16, "Byte array must be at least 16 bytes."
 		Assert digest.length >= 16, "Byte array must be at least 16 bytes."
 		Return bmx_digest_md5_done(digestPtr, digest)
 		Return bmx_digest_md5_done(digestPtr, digest)
 	End Method
 	End Method
@@ -69,7 +69,7 @@ Type TMD5DigestRegister Extends TDigestRegister
 		End If
 		End If
 	End Method
 	End Method
 
 
-	Method ToString:String()
+	Method ToString:String() Override
 		Return "MD5"
 		Return "MD5"
 	End Method
 	End Method
 	
 	

+ 4 - 4
sha1digest.mod/sha1digest.bmx

@@ -39,14 +39,14 @@ Type TSHA1 Extends TMessageDigest
 		digestPtr = bmx_digest_sha1_init()
 		digestPtr = bmx_digest_sha1_init()
 	End Method
 	End Method
 
 
-	Method OutBytes:Int()
+	Method OutBytes:Int() Override
 		Return 20
 		Return 20
 	End Method
 	End Method
 	
 	
 	Rem
 	Rem
 	bbdoc: Updates the hash with @dataLen bytes of data.
 	bbdoc: Updates the hash with @dataLen bytes of data.
 	End Rem
 	End Rem
-	Method Update:Int(data:Byte Ptr, dataLen:Int)
+	Method Update:Int(data:Byte Ptr, dataLen:Int) Override
 		Return bmx_digest_sha1_process(digestPtr, data, dataLen)
 		Return bmx_digest_sha1_process(digestPtr, data, dataLen)
 	End Method
 	End Method
 	
 	
@@ -54,7 +54,7 @@ Type TSHA1 Extends TMessageDigest
 	bbdoc: Finishes hashing and produces the digest, filling @digest with the hashed bytes.
 	bbdoc: Finishes hashing and produces the digest, filling @digest with the hashed bytes.
 	about: The hashing state is reset, ready to create a new digest.
 	about: The hashing state is reset, ready to create a new digest.
 	End Rem
 	End Rem
-	Method Finish:Int(digest:Byte[])
+	Method Finish:Int(digest:Byte[]) Override
 		Assert digest.length >= 20, "Byte array must be at least 20 bytes."
 		Assert digest.length >= 20, "Byte array must be at least 20 bytes."
 		Return bmx_digest_sha1_done(digestPtr, digest)
 		Return bmx_digest_sha1_done(digestPtr, digest)
 	End Method
 	End Method
@@ -69,7 +69,7 @@ Type TSHA1DigestRegister Extends TDigestRegister
 		End If
 		End If
 	End Method
 	End Method
 
 
-	Method ToString:String()
+	Method ToString:String() Override
 		Return "SHA-1"
 		Return "SHA-1"
 	End Method
 	End Method
 
 

+ 4 - 4
sha256digest.mod/sha256digest.bmx

@@ -39,14 +39,14 @@ Type TSHA256 Extends TMessageDigest
 		digestPtr = bmx_digest_sha256_init()
 		digestPtr = bmx_digest_sha256_init()
 	End Method
 	End Method
 
 
-	Method OutBytes:Int()
+	Method OutBytes:Int() Override
 		Return 32
 		Return 32
 	End Method
 	End Method
 	
 	
 	Rem
 	Rem
 	bbdoc: Updates the hash with @dataLen bytes of data.
 	bbdoc: Updates the hash with @dataLen bytes of data.
 	End Rem
 	End Rem
-	Method Update:Int(data:Byte Ptr, dataLen:Int)
+	Method Update:Int(data:Byte Ptr, dataLen:Int) Override
 		Return bmx_digest_sha256_process(digestPtr, data, dataLen)
 		Return bmx_digest_sha256_process(digestPtr, data, dataLen)
 	End Method
 	End Method
 	
 	
@@ -54,7 +54,7 @@ Type TSHA256 Extends TMessageDigest
 	bbdoc: Finishes hashing and produces the digest, filling @digest with the hashed bytes.
 	bbdoc: Finishes hashing and produces the digest, filling @digest with the hashed bytes.
 	about: The hashing state is reset, ready to create a new digest.
 	about: The hashing state is reset, ready to create a new digest.
 	End Rem
 	End Rem
-	Method Finish:Int(digest:Byte[])
+	Method Finish:Int(digest:Byte[]) Override
 		Assert digest.length >= 32, "Byte array must be at least 32 bytes."
 		Assert digest.length >= 32, "Byte array must be at least 32 bytes."
 		Return bmx_digest_sha256_done(digestPtr, digest)
 		Return bmx_digest_sha256_done(digestPtr, digest)
 	End Method
 	End Method
@@ -70,7 +70,7 @@ Type TSHA256DigestRegister Extends TDigestRegister
 		End If
 		End If
 	End Method
 	End Method
 
 
-	Method ToString:String()
+	Method ToString:String() Override
 		Return "SHA-256"
 		Return "SHA-256"
 	End Method
 	End Method
 
 

+ 4 - 4
sha512digest.mod/sha512digest.bmx

@@ -39,14 +39,14 @@ Type TSHA512 Extends TMessageDigest
 		digestPtr = bmx_digest_SHA512_init()
 		digestPtr = bmx_digest_SHA512_init()
 	End Method
 	End Method
 
 
-	Method OutBytes:Int()
+	Method OutBytes:Int() Override
 		Return 64
 		Return 64
 	End Method
 	End Method
 	
 	
 	Rem
 	Rem
 	bbdoc: Updates the hash with @dataLen bytes of data.
 	bbdoc: Updates the hash with @dataLen bytes of data.
 	End Rem
 	End Rem
-	Method Update:Int(data:Byte Ptr, dataLen:Int)
+	Method Update:Int(data:Byte Ptr, dataLen:Int) Override
 		Return bmx_digest_SHA512_process(digestPtr, data, dataLen)
 		Return bmx_digest_SHA512_process(digestPtr, data, dataLen)
 	End Method
 	End Method
 	
 	
@@ -54,7 +54,7 @@ Type TSHA512 Extends TMessageDigest
 	bbdoc: Finishes hashing and produces the digest, filling @digest with the hashed bytes.
 	bbdoc: Finishes hashing and produces the digest, filling @digest with the hashed bytes.
 	about: The hashing state is reset, ready to create a new digest.
 	about: The hashing state is reset, ready to create a new digest.
 	End Rem
 	End Rem
-	Method Finish:Int(digest:Byte[])
+	Method Finish:Int(digest:Byte[]) Override
 		Assert digest.length >= 64, "Byte array must be at least 64 bytes."
 		Assert digest.length >= 64, "Byte array must be at least 64 bytes."
 		Return bmx_digest_SHA512_done(digestPtr, digest)
 		Return bmx_digest_SHA512_done(digestPtr, digest)
 	End Method
 	End Method
@@ -70,7 +70,7 @@ Type TSHA512DigestRegister Extends TDigestRegister
 		End If
 		End If
 	End Method
 	End Method
 
 
-	Method ToString:String()
+	Method ToString:String() Override
 		Return "SHA-512"
 		Return "SHA-512"
 	End Method
 	End Method