[v15.4] New PS3 features & updated downloads

- All changes can be found on the v15.4 release page

Author: SvenGDK

LatestBuild.txt

@@ -1 +1 @@
-15.3.1
+15.4.0

PS Multi Tools/Classes/AESEngine.vb

@@ -1,144 +1,122 @@
 Imports System.IO
 Imports System.Security.Cryptography
+Imports System.Text
 
 Public Class AESEngine
 
     Public Shared Function Encrypt(clearData As Byte(), Key As Byte(), IV As Byte(), cipherMode As CipherMode, paddingMode As PaddingMode) As Byte()
-        Dim ms As New MemoryStream()
-        Dim alg As Rijndael = Rijndael.Create()
-
-        alg.Mode = cipherMode
-        alg.Padding = paddingMode
-        alg.Key = Key
-        alg.IV = IV
-
-        Dim cs As New CryptoStream(ms, alg.CreateEncryptor(), CryptoStreamMode.Write)
-        cs.Write(clearData, 0, clearData.Length)
-        cs.Close()
-
-        Dim encryptedData As Byte() = ms.ToArray()
-
-        Return encryptedData
+        Using ms As New MemoryStream()
+            Using alg As Aes = Aes.Create()
+                alg.Mode = cipherMode
+                alg.Padding = paddingMode
+                alg.Key = Key
+                alg.IV = IV
+
+                Using cs As New CryptoStream(ms, alg.CreateEncryptor(), CryptoStreamMode.Write)
+                    cs.Write(clearData, 0, clearData.Length)
+                End Using
+            End Using
+            Return ms.ToArray()
+        End Using
     End Function
 
     Public Shared Function Encrypt(clearText As String, Password As String, cipherMode As CipherMode, paddingMode As PaddingMode) As String
-        Dim clearBytes As Byte() = Text.Encoding.Unicode.GetBytes(clearText)
-        Dim pdb As New PasswordDeriveBytes(Password, New Byte() {&H49, &H76, &H61, &H6E, &H20, &H4D, &H65, &H64, &H76, &H65, &H64, &H65, &H76})
-        Dim encryptedData As Byte() = Encrypt(clearBytes, pdb.GetBytes(32), pdb.GetBytes(16), cipherMode, paddingMode)
+        Dim clearBytes As Byte() = Encoding.Unicode.GetBytes(clearText)
+        Dim salt As Byte() = New Byte() {&H49, &H76, &H61, &H6E, &H20, &H4D, &H65, &H64, &H76, &H65, &H64, &H65, &H76}
+        Dim pdb As New Rfc2898DeriveBytes(Password, salt, 10000, HashAlgorithmName.SHA256)  ' New overload using SHA256
 
+        Dim encryptedData As Byte() = Encrypt(clearBytes, pdb.GetBytes(32), pdb.GetBytes(16), cipherMode, paddingMode)
         Return Convert.ToBase64String(encryptedData)
     End Function
 
     Public Shared Function Encrypt(clearData As Byte(), Password As String, cipherMode As CipherMode, paddingMode As PaddingMode) As Byte()
-        Dim pdb As New PasswordDeriveBytes(Password, New Byte() {&H49, &H76, &H61, &H6E, &H20, &H4D, &H65, &H64, &H76, &H65, &H64, &H65, &H76})
+        Dim salt As Byte() = New Byte() {&H49, &H76, &H61, &H6E, &H20, &H4D, &H65, &H64, &H76, &H65, &H64, &H65, &H76}
+        Dim pdb As New Rfc2898DeriveBytes(Password, salt, 10000, HashAlgorithmName.SHA256)
         Return Encrypt(clearData, pdb.GetBytes(32), pdb.GetBytes(16), cipherMode, paddingMode)
     End Function
 
     Public Shared Sub Encrypt(fileIn As String, fileOut As String, Password As String, cipherMode As CipherMode, paddingMode As PaddingMode)
-        ' First we are going to open the file streams 
-        Dim fsIn As New FileStream(fileIn, FileMode.Open, FileAccess.Read)
-        Dim fsOut As New FileStream(fileOut, FileMode.OpenOrCreate, FileAccess.Write)
-
-        ' Then we are going to derive a Key and an IV from the
-        ' Password and create an algorithm 
-
-        Dim pdb As New PasswordDeriveBytes(Password, New Byte() {&H49, &H76, &H61, &H6E, &H20, &H4D, _
-            &H65, &H64, &H76, &H65, &H64, &H65, _
-            &H76})
-
-        Dim alg As Rijndael = Rijndael.Create()
-
-        alg.Mode = cipherMode
-        alg.Padding = paddingMode
-        alg.Key = pdb.GetBytes(32)
-        alg.IV = pdb.GetBytes(16)
-
-        ' Now create a crypto stream through which we are going
-        ' to be pumping data. 
-        ' Our fileOut is going to be receiving the encrypted bytes. 
-
-        Dim cs As New CryptoStream(fsOut, alg.CreateEncryptor(), CryptoStreamMode.Write)
-
-        ' Now will will initialize a buffer and will be processing
-        ' the input file in chunks. 
-        ' This is done to avoid reading the whole file (which can
-        ' be huge) into memory. 
-
-        Dim bufferLen As Integer = 4096
-        Dim buffer As Byte() = New Byte(bufferLen - 1) {}
-        Dim bytesRead As Integer
-
-        Do
-            ' read a chunk of data from the input file 
-            bytesRead = fsIn.Read(buffer, 0, bufferLen)
-
-            ' encrypt it 
-            cs.Write(buffer, 0, bytesRead)
-        Loop While bytesRead <> 0
-
-        cs.Close()
-        fsIn.Close()
+        Dim salt As Byte() = New Byte() {&H49, &H76, &H61, &H6E, &H20, &H4D, &H65, &H64, &H76, &H65, &H64, &H65, &H76}
+        Dim pdb As New Rfc2898DeriveBytes(Password, salt, 10000, HashAlgorithmName.SHA256)
+        Using fsIn As New FileStream(fileIn, FileMode.Open, FileAccess.Read),
+              fsOut As New FileStream(fileOut, FileMode.OpenOrCreate, FileAccess.Write)
+            Using alg As Aes = Aes.Create()
+                alg.Mode = cipherMode
+                alg.Padding = paddingMode
+                alg.Key = pdb.GetBytes(32)
+                alg.IV = pdb.GetBytes(16)
+
+                Using cs As New CryptoStream(fsOut, alg.CreateEncryptor(), CryptoStreamMode.Write)
+                    Dim bufferLen As Integer = 4096
+                    Dim buffer As Byte() = New Byte(bufferLen - 1) {}
+                    Dim bytesRead As Integer
+
+                    Do
+                        bytesRead = fsIn.Read(buffer, 0, bufferLen)
+                        If bytesRead > 0 Then
+                            cs.Write(buffer, 0, bytesRead)
+                        End If
+                    Loop While bytesRead <> 0
+                End Using
+            End Using
+        End Using
     End Sub
 
     Public Shared Function Decrypt(cipherData As Byte(), Key As Byte(), IV As Byte(), cipherMode As CipherMode, paddingMode As PaddingMode) As Byte()
-        Dim ms As New MemoryStream()
-        Dim alg As Rijndael = Rijndael.Create()
-
-        alg.Mode = cipherMode
-        alg.Padding = paddingMode
-        alg.Key = Key
-        alg.IV = IV
-
-        Dim cs As New CryptoStream(ms, alg.CreateDecryptor(), CryptoStreamMode.Write)
-
-        cs.Write(cipherData, 0, cipherData.Length)
-        cs.Close()
-
-        Dim decryptedData As Byte() = ms.ToArray()
-
-        Return decryptedData
+        Using ms As New MemoryStream()
+            Using alg As Aes = Aes.Create()
+                alg.Mode = cipherMode
+                alg.Padding = paddingMode
+                alg.Key = Key
+                alg.IV = IV
+
+                Using cs As New CryptoStream(ms, alg.CreateDecryptor(), CryptoStreamMode.Write)
+                    cs.Write(cipherData, 0, cipherData.Length)
+                End Using
+            End Using
+            Return ms.ToArray()
+        End Using
     End Function
 
     Public Shared Function Decrypt(cipherText As String, Password As String, cipherMode As CipherMode, paddingMode As PaddingMode) As String
         Dim cipherBytes As Byte() = Convert.FromBase64String(cipherText)
-        Dim pdb As New PasswordDeriveBytes(Password, New Byte() {&H49, &H76, &H61, &H6E, &H20, &H4D, &H65, &H64, &H76, &H65, &H64, &H65, &H76})
+        Dim salt As Byte() = New Byte() {&H49, &H76, &H61, &H6E, &H20, &H4D, &H65, &H64, &H76, &H65, &H64, &H65, &H76}
+        Dim pdb As New Rfc2898DeriveBytes(Password, salt, 10000, HashAlgorithmName.SHA256)
         Dim decryptedData As Byte() = Decrypt(cipherBytes, pdb.GetBytes(32), pdb.GetBytes(16), cipherMode, paddingMode)
-
-        Return Text.Encoding.Unicode.GetString(decryptedData)
+        Return Encoding.Unicode.GetString(decryptedData)
     End Function
 
     Public Shared Function Decrypt(cipherData As Byte(), Password As String, cipherMode As CipherMode, paddingMode As PaddingMode) As Byte()
-        Dim pdb As New PasswordDeriveBytes(Password, New Byte() {&H49, &H76, &H61, &H6E, &H20, &H4D, &H65, &H64, &H76, &H65, &H64, &H65, &H76})
-
+        Dim salt As Byte() = New Byte() {&H49, &H76, &H61, &H6E, &H20, &H4D, &H65, &H64, &H76, &H65, &H64, &H65, &H76}
+        Dim pdb As New Rfc2898DeriveBytes(Password, salt, 10000, HashAlgorithmName.SHA256)
         Return Decrypt(cipherData, pdb.GetBytes(32), pdb.GetBytes(16), cipherMode, paddingMode)
-
     End Function
 
     Public Shared Sub Decrypt(fileIn As String, fileOut As String, Password As String, cipherMode As CipherMode, paddingMode As PaddingMode)
-        Dim fsIn As New FileStream(fileIn, FileMode.Open, FileAccess.Read)
-        Dim fsOut As New FileStream(fileOut, FileMode.OpenOrCreate, FileAccess.Write)
-
-        Dim pdb As New PasswordDeriveBytes(Password, New Byte() {&H49, &H76, &H61, &H6E, &H20, &H4D, &H65, &H64, &H76, &H65, &H64, &H65, &H76})
-        Dim alg As Rijndael = Rijndael.Create()
-
-        alg.Mode = cipherMode
-        alg.Padding = paddingMode
-        alg.Key = pdb.GetBytes(32)
-        alg.IV = pdb.GetBytes(16)
-
-        Dim cs As New CryptoStream(fsOut, alg.CreateDecryptor(), CryptoStreamMode.Write)
-        Dim bufferLen As Integer = 4096
-        Dim buffer As Byte() = New Byte(bufferLen - 1) {}
-        Dim bytesRead As Integer
-
-        Do
-            bytesRead = fsIn.Read(buffer, 0, bufferLen)
-
-            cs.Write(buffer, 0, bytesRead)
-        Loop While bytesRead <> 0
-
-        cs.Close()
-        fsIn.Close()
+        Dim salt As Byte() = New Byte() {&H49, &H76, &H61, &H6E, &H20, &H4D, &H65, &H64, &H76, &H65, &H64, &H65, &H76}
+        Dim pdb As New Rfc2898DeriveBytes(Password, salt, 10000, HashAlgorithmName.SHA256)
+        Using fsIn As New FileStream(fileIn, FileMode.Open, FileAccess.Read),
+              fsOut As New FileStream(fileOut, FileMode.OpenOrCreate, FileAccess.Write)
+            Using alg As Aes = Aes.Create()
+                alg.Mode = cipherMode
+                alg.Padding = paddingMode
+                alg.Key = pdb.GetBytes(32)
+                alg.IV = pdb.GetBytes(16)
+
+                Using cs As New CryptoStream(fsOut, alg.CreateDecryptor(), CryptoStreamMode.Write)
+                    Dim bufferLen As Integer = 4096
+                    Dim buffer As Byte() = New Byte(bufferLen - 1) {}
+                    Dim bytesRead As Integer
+
+                    Do
+                        bytesRead = fsIn.Read(buffer, 0, bufferLen)
+                        If bytesRead > 0 Then
+                            cs.Write(buffer, 0, bytesRead)
+                        End If
+                    Loop While bytesRead <> 0
+                End Using
+            End Using
+        End Using
     End Sub
 
-End Class
+End Class

PS Multi Tools/Classes/MD5Hash.vb

@@ -4,40 +4,25 @@ Imports System.Text
 
 Public Class MD5Hash
 
-    Public Shared Function MD5StringHash(Str As String) As String
-        Dim Data As Byte()
-        Dim Result As Byte()
-        Dim Res As String = ""
-        Dim Temp As String
-
-        Data = Encoding.ASCII.GetBytes(Str)
-        Result = MD5.HashData(Data)
-
-        For i As Integer = 0 To Result.Length - 1
-            Temp = Hex(Result(i))
-            If Len(Temp) = 1 Then Temp = "0" & Temp
-            Res += Temp
+    Public Shared Function MD5StringHash(InputString As String) As String
+        Dim data As Byte() = Encoding.ASCII.GetBytes(InputString)
+        Dim hash As Byte() = MD5.HashData(data)
+        Dim sb As New StringBuilder()
+        For Each b As Byte In hash
+            sb.Append(b.ToString("x2"))
         Next
-        Return Res
+        Return sb.ToString()
     End Function
 
-    Public Shared Function MD5FileHash(SelFile As String) As String
-        Dim MD5 As New MD5CryptoServiceProvider
-        Dim Hash As Byte()
-        Dim Result As String = ""
-        Dim Temp As String
-
-        Dim NewFileStream As New FileStream(SelFile, FileMode.Open, FileAccess.Read, FileShare.Read, 8192)
-        MD5.ComputeHash(NewFileStream)
-        NewFileStream.Close()
-
-        Hash = MD5.Hash
-        For i As Integer = 0 To Hash.Length - 1
-            Temp = Hex(Hash(i))
-            If Len(Temp) = 1 Then Temp = "0" & Temp
-            Result += Temp
-        Next
-        Return Result
+    Public Shared Function MD5FileHash(InputFile As String) As String
+        Using stream As New FileStream(InputFile, FileMode.Open, FileAccess.Read, FileShare.Read, 8192)
+            Dim hash As Byte() = MD5.HashData(stream)
+            Dim sb As New StringBuilder()
+            For Each b As Byte In hash
+                sb.Append(b.ToString("x2"))
+            Next
+            Return sb.ToString()
+        End Using
     End Function
 
 End Class

PS Multi Tools/Classes/PS3Game.vb

@@ -27,6 +27,7 @@ Public Class PS3Game
     Private _ImageWidth As Double
     Private _ImageHeight As Double
     Private _GameRootLocation As GameLocation
+    Private _ISOEncryption As String
 
     Public Enum GameFileTypes
         Backup
@@ -267,6 +268,15 @@ Public Class PS3Game
         End Set
     End Property
 
+    Public Property ISOEncryption As String
+        Get
+            Return _ISOEncryption
+        End Get
+        Set
+            _ISOEncryption = Value
+        End Set
+    End Property
+
 #Region "Functions"
 
     Public Shared Function GetCategory(SFOCategory As String) As String