mirror of
https://github.com/Xpl0itU/WiiUDownloader.git
synced 2025-05-14 15:15:05 -04:00
Fix high memory usage
This commit is contained in:
parent
8ba5a4c1bc
commit
28b2ef38d9
3 changed files with 50 additions and 28 deletions
|
@ -355,6 +355,7 @@ func (mw *MainWindow) onCategoryToggled(button *gtk.ToggleButton) {
|
||||||
func (mw *MainWindow) onDecryptContentsMenuItemClicked() {
|
func (mw *MainWindow) onDecryptContentsMenuItemClicked() {
|
||||||
selectedPath, err := dialog.Directory().Title("Select the path to decrypt").Browse()
|
selectedPath, err := dialog.Directory().Title("Select the path to decrypt").Browse()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
mw.progressWindow.Window.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -383,6 +384,7 @@ func (mw *MainWindow) isSelectionInQueue() bool {
|
||||||
if !isInQueue.(bool) {
|
if !isInQueue.(bool) {
|
||||||
allTitlesInQueue = false
|
allTitlesInQueue = false
|
||||||
}
|
}
|
||||||
|
inQueue.Unset()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
return allTitlesInQueue
|
return allTitlesInQueue
|
||||||
|
@ -469,6 +471,7 @@ func (mw *MainWindow) onAddToQueueClicked() {
|
||||||
nameStr, _ := name.GetString()
|
nameStr, _ := name.GetString()
|
||||||
mw.addToQueue(tidStr, nameStr)
|
mw.addToQueue(tidStr, nameStr)
|
||||||
mw.addToQueueButton.SetLabel("Remove from queue")
|
mw.addToQueueButton.SetLabel("Remove from queue")
|
||||||
|
name.Unset()
|
||||||
} else {
|
} else {
|
||||||
mw.removeFromQueue(tidStr)
|
mw.removeFromQueue(tidStr)
|
||||||
mw.addToQueueButton.SetLabel("Add to queue")
|
mw.addToQueueButton.SetLabel("Add to queue")
|
||||||
|
@ -477,6 +480,8 @@ func (mw *MainWindow) onAddToQueueClicked() {
|
||||||
queueModel, _ := mw.treeView.GetModel()
|
queueModel, _ := mw.treeView.GetModel()
|
||||||
queueModel.(*gtk.ListStore).SetValue(row, IN_QUEUE_COLUMN, addToQueue)
|
queueModel.(*gtk.ListStore).SetValue(row, IN_QUEUE_COLUMN, addToQueue)
|
||||||
mw.treeView.SetCursor(path, mw.treeView.GetColumn(IN_QUEUE_COLUMN), false)
|
mw.treeView.SetCursor(path, mw.treeView.GetColumn(IN_QUEUE_COLUMN), false)
|
||||||
|
inQueue.Unset()
|
||||||
|
tid.Unset()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -497,6 +502,7 @@ func (mw *MainWindow) updateTitlesInQueue() {
|
||||||
tidNum, _ := strconv.ParseUint(tidStr, 16, 64)
|
tidNum, _ := strconv.ParseUint(tidStr, 16, 64)
|
||||||
isInQueue := mw.isTitleInQueue(wiiudownloader.TitleEntry{TitleID: tidNum})
|
isInQueue := mw.isTitleInQueue(wiiudownloader.TitleEntry{TitleID: tidNum})
|
||||||
storeRef.SetValue(iter, IN_QUEUE_COLUMN, isInQueue)
|
storeRef.SetValue(iter, IN_QUEUE_COLUMN, isInQueue)
|
||||||
|
tid.Unset()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !storeRef.IterNext(iter) {
|
if !storeRef.IterNext(iter) {
|
||||||
|
|
|
@ -2,6 +2,8 @@ package wiiudownloader
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"crypto/aes"
|
||||||
|
"crypto/cipher"
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
@ -93,11 +95,12 @@ func downloadFile(progressWindow *ProgressWindow, client *grab.Client, url strin
|
||||||
|
|
||||||
resp := client.Do(req)
|
resp := client.Do(req)
|
||||||
|
|
||||||
progressWindow.label.SetText(path.Base(outputPath))
|
filePath := path.Base(outputPath)
|
||||||
|
|
||||||
go func(err *error) {
|
go func(err *error) {
|
||||||
for !resp.IsComplete() {
|
for !resp.IsComplete() {
|
||||||
glib.IdleAdd(func() {
|
glib.IdleAdd(func() {
|
||||||
|
progressWindow.label.SetText(filePath)
|
||||||
progressWindow.bar.SetFraction(resp.Progress())
|
progressWindow.bar.SetFraction(resp.Progress())
|
||||||
progressWindow.percentLabel.SetText(fmt.Sprintf("%.0f%%", 100*resp.Progress()))
|
progressWindow.percentLabel.SetText(fmt.Sprintf("%.0f%%", 100*resp.Progress()))
|
||||||
})
|
})
|
||||||
|
@ -113,6 +116,9 @@ func downloadFile(progressWindow *ProgressWindow, client *grab.Client, url strin
|
||||||
}(&err)
|
}(&err)
|
||||||
|
|
||||||
for {
|
for {
|
||||||
|
for gtk.EventsPending() {
|
||||||
|
gtk.MainIteration()
|
||||||
|
}
|
||||||
if done {
|
if done {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -131,7 +137,7 @@ func DownloadTitle(titleID string, outputDirectory string, doDecryption bool, pr
|
||||||
})
|
})
|
||||||
outputDir := strings.TrimRight(outputDirectory, "/\\")
|
outputDir := strings.TrimRight(outputDirectory, "/\\")
|
||||||
baseURL := fmt.Sprintf("http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/%s", titleID)
|
baseURL := fmt.Sprintf("http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/%s", titleID)
|
||||||
titleKeyBytes, err := hex.DecodeString(titleID)
|
titleIDBytes, err := hex.DecodeString(titleID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -210,29 +216,50 @@ func DownloadTitle(titleID string, outputDirectory string, doDecryption bool, pr
|
||||||
defer certFile.Close()
|
defer certFile.Close()
|
||||||
fmt.Printf("[Info] Certificate saved to ./%v \n", certPath)
|
fmt.Printf("[Info] Certificate saved to ./%v \n", certPath)
|
||||||
|
|
||||||
|
c, err := aes.NewCipher(commonKey)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to create AES cipher: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
decryptedTitleKey := make([]byte, len(encryptedTitleKey))
|
||||||
|
cbc := cipher.NewCBCDecrypter(c, append(titleIDBytes, make([]byte, 8)...))
|
||||||
|
cbc.CryptBlocks(decryptedTitleKey, encryptedTitleKey)
|
||||||
|
|
||||||
|
cipherHashTree, err := aes.NewCipher(decryptedTitleKey)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to create AES cipher: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var id uint32
|
||||||
|
tmdDataReader := bytes.NewReader(tmdData)
|
||||||
|
|
||||||
for i := 0; i < int(contentCount); i++ {
|
for i := 0; i < int(contentCount); i++ {
|
||||||
offset := 2820 + (48 * i)
|
offset := 2820 + (48 * i)
|
||||||
var id uint32
|
tmdDataReader.Seek(int64(offset), 0)
|
||||||
if err := binary.Read(bytes.NewReader(tmdData[offset:offset+4]), binary.BigEndian, &id); err != nil {
|
if err := binary.Read(tmdDataReader, binary.BigEndian, &id); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
appPath := filepath.Join(outputDir, fmt.Sprintf("%08X.app", id))
|
filePath := filepath.Join(outputDir, fmt.Sprintf("%08X.app", id))
|
||||||
downloadURL = fmt.Sprintf("%s/%08X", baseURL, id)
|
downloadURL = fmt.Sprintf("%s/%08X", baseURL, id)
|
||||||
if err := downloadFile(progressWindow, client, downloadURL, appPath); err != nil {
|
if err := downloadFile(progressWindow, client, downloadURL, filePath); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if tmdData[offset+7]&0x2 == 2 {
|
if tmdData[offset+7]&0x2 == 2 {
|
||||||
h3Path := filepath.Join(outputDir, fmt.Sprintf("%08X.h3", id))
|
filePath = filepath.Join(outputDir, fmt.Sprintf("%08X.h3", id))
|
||||||
downloadURL = fmt.Sprintf("%s/%08X.h3", baseURL, id)
|
downloadURL = fmt.Sprintf("%s/%08X.h3", baseURL, id)
|
||||||
if err := downloadFile(progressWindow, client, downloadURL, h3Path); err != nil {
|
if err := downloadFile(progressWindow, client, downloadURL, filePath); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
var content contentInfo
|
var content contentInfo
|
||||||
content.Hash = tmdData[offset+16 : offset+0x14]
|
content.Hash = tmdData[offset+16 : offset+0x14]
|
||||||
content.ID = fmt.Sprintf("%08X", id)
|
content.ID = fmt.Sprintf("%08X", id)
|
||||||
binary.Read(bytes.NewReader(tmdData[offset+8:offset+15]), binary.BigEndian, &content.Size)
|
tmdDataReader.Seek(int64(offset+8), 0)
|
||||||
if err := checkContentHashes(outputDirectory, encryptedTitleKey, titleKeyBytes, content); err != nil {
|
if err := binary.Read(tmdDataReader, binary.BigEndian, &content.Size); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := checkContentHashes(outputDirectory, content, &cipherHashTree); err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
25
hash.go
25
hash.go
|
@ -11,16 +11,8 @@ import (
|
||||||
|
|
||||||
var commonKey = []byte{0xD7, 0xB0, 0x04, 0x02, 0x65, 0x9B, 0xA2, 0xAB, 0xD2, 0xCB, 0x0D, 0xB2, 0x7F, 0xA2, 0xB6, 0x56}
|
var commonKey = []byte{0xD7, 0xB0, 0x04, 0x02, 0x65, 0x9B, 0xA2, 0xAB, 0xD2, 0xCB, 0x0D, 0xB2, 0x7F, 0xA2, 0xB6, 0x56}
|
||||||
|
|
||||||
func checkContentHashes(path string, encryptedTitleKey []byte, titleID []byte, content contentInfo) error {
|
func checkContentHashes(path string, content contentInfo, cipherHashTree *cipher.Block) error {
|
||||||
c, err := aes.NewCipher(commonKey)
|
cHashTree := *cipherHashTree
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to create AES cipher: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
decryptedTitleKey := make([]byte, len(encryptedTitleKey))
|
|
||||||
cbc := cipher.NewCBCDecrypter(c, append(titleID, make([]byte, 8)...))
|
|
||||||
cbc.CryptBlocks(decryptedTitleKey, encryptedTitleKey)
|
|
||||||
|
|
||||||
h3Data, err := os.ReadFile(fmt.Sprintf("%s/%s.h3", path, content.ID))
|
h3Data, err := os.ReadFile(fmt.Sprintf("%s/%s.h3", path, content.ID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to read H3 hash tree file: %w", err)
|
return fmt.Errorf("failed to read H3 hash tree file: %w", err)
|
||||||
|
@ -29,6 +21,7 @@ func checkContentHashes(path string, encryptedTitleKey []byte, titleID []byte, c
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to open encrypted file: %w", err)
|
return fmt.Errorf("failed to open encrypted file: %w", err)
|
||||||
}
|
}
|
||||||
|
defer encryptedFile.Close()
|
||||||
|
|
||||||
h3Hash := sha1.Sum(h3Data)
|
h3Hash := sha1.Sum(h3Data)
|
||||||
if !reflect.DeepEqual(h3Hash[:8], content.Hash[:8]) {
|
if !reflect.DeepEqual(h3Hash[:8], content.Hash[:8]) {
|
||||||
|
@ -36,22 +29,18 @@ func checkContentHashes(path string, encryptedTitleKey []byte, titleID []byte, c
|
||||||
}
|
}
|
||||||
|
|
||||||
chunkCount := int(content.Size / 0x10000)
|
chunkCount := int(content.Size / 0x10000)
|
||||||
decryptedContent := make([]byte, content.Size)
|
decryptedContent := make([]byte, 0x400)
|
||||||
|
|
||||||
h0HashNum := 0
|
h0HashNum := 0
|
||||||
h1HashNum := 0
|
h1HashNum := 0
|
||||||
h2HashNum := 0
|
h2HashNum := 0
|
||||||
h3HashNum := 0
|
h3HashNum := 0
|
||||||
|
|
||||||
|
buffer := make([]byte, 0x400)
|
||||||
|
iv := make([]byte, aes.BlockSize)
|
||||||
for chunkNum := 0; chunkNum < chunkCount; chunkNum++ {
|
for chunkNum := 0; chunkNum < chunkCount; chunkNum++ {
|
||||||
cipherHashTree, err := aes.NewCipher(decryptedTitleKey)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to create AES cipher: %w", err)
|
|
||||||
}
|
|
||||||
hashTree := cipher.NewCBCDecrypter(cipherHashTree, make([]byte, aes.BlockSize))
|
|
||||||
buffer := make([]byte, 0x400)
|
|
||||||
encryptedFile.Read(buffer)
|
encryptedFile.Read(buffer)
|
||||||
hashTree.CryptBlocks(decryptedContent, buffer)
|
cipher.NewCBCDecrypter(cHashTree, iv).CryptBlocks(decryptedContent, buffer)
|
||||||
|
|
||||||
h0Hashes := decryptedContent[0:0x140]
|
h0Hashes := decryptedContent[0:0x140]
|
||||||
h1Hashes := decryptedContent[0x140:0x280]
|
h1Hashes := decryptedContent[0x140:0x280]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue