mirrors/WiiUDownloader
1
0
Fork 0
mirror of https://github.com/Xpl0itU/WiiUDownloader.git synced 2025-05-19 17:55:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Switch to fasthttp"

Browse source 
This reverts commit 461d6f4a84.
This commit is contained in:
Xpl0itU 2024-04-08 14:35:20 +02:00
parent f054096e64
commit 28581f79a0
7 changed files with 76 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

11
certificate.go
View file

@ -4,10 +4,9 @@ import (
"bytes"
"context"
"fmt"
"net/http"
"os"
"path"
"github.com/valyala/fasthttp"
)
var cetkData []byte
@ -29,12 +28,12 @@ func getCert(tmdData []byte, id int, numContents uint16) ([]byte, error) {
}
}
func getDefaultCert(cancelCtx context.Context, progressReporter ProgressReporter, client *fasthttp.Client) ([]byte, error) {
func getDefaultCert(cancelCtx context.Context, progressReporter ProgressReporter, client *http.Client, buffer []byte) ([]byte, error) {
if len(cetkData) >= 0x350+0x300 {
return cetkData[0x350 : 0x350+0x300], nil
}
cetkDir := path.Join(os.TempDir(), "cetk")
if err := downloadFile(cancelCtx, progressReporter, client, "http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/000500101000400a/cetk", cetkDir, true); err != nil {
if err := downloadFile(cancelCtx, progressReporter, client, "http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/000500101000400a/cetk", cetkDir, true, buffer); err != nil {
return nil, err
}
cetkData, err := os.ReadFile(cetkDir)
@ -52,7 +51,7 @@ func getDefaultCert(cancelCtx context.Context, progressReporter ProgressReporter
return nil, fmt.Errorf("failed to download OSv10 cetk, length: %d", len(cetkData))
}
func GenerateCert(tmdData []byte, contentCount uint16, progressReporter ProgressReporter, client *fasthttp.Client, cancelCtx context.Context) (bytes.Buffer, error) {
func GenerateCert(tmdData []byte, contentCount uint16, progressReporter ProgressReporter, client *http.Client, cancelCtx context.Context, buffer []byte) (bytes.Buffer, error) {
cert := bytes.Buffer{}
cert0, err := getCert(tmdData, 0, contentCount)
@ -67,7 +66,7 @@ func GenerateCert(tmdData []byte, contentCount uint16, progressReporter Progress
}
cert.Write(cert1)
defaultCert, err := getDefaultCert(cancelCtx, progressReporter, client)
defaultCert, err := getDefaultCert(cancelCtx, progressReporter, client, buffer)
if err != nil {
return bytes.Buffer{}, err
}