Skip to content

Use tempfile instead of memory to prepare the plaintext and cipher bu… #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use tempfile instead of memory to prepare the plaintext and cipher bu… #145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 37 additions & 15 deletions tools/ps3py/pkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import struct
import sys
import tempfile
import hashlib
import os
import getopt
Expand Down Expand Up @@ -235,6 +236,26 @@ def setContextNum(key, tmpnum):

import pkgcrypt

def cryptfile(key, infile, outfile):
if not isinstance(key, list):
return b""
# Call our ultra fast c implemetation
infile.seek(0, 2)
length = infile.tell()
infile.seek(0)
offset = 0
BS = 8 * 1024 * 1024
while length:
len = length
if len > BS:
len = BS
inbuf = infile.read(len)
data, new_key = pkgcrypt.pkgcrypt(listToString(key), inbuf, len);
outfile.write(data)
length = length - len
offset = offset + len
key[:] = new_key

def crypt(key, inbuf, length):
if not isinstance(key, list):
return ""
Expand Down Expand Up @@ -427,7 +448,7 @@ def pack(folder, contentid, outname=None):
files = []
getFiles(files, folder, folder)
header.itemCount = len(files)
dataToEncrypt = b""
tmpFile = tempfile.TemporaryFile()
fileDescLength = 0
fileOff = 0x20 * len(files)
for file in files:
Expand All @@ -437,12 +458,12 @@ def pack(folder, contentid, outname=None):
for file in files:
file.fileOff = fileOff
fileOff += (file.fileSize + 0x0F) & ~0x0F
dataToEncrypt += file.pack()
tmpFile.write(file.pack())
for file in files:
alignedSize = (file.fileNameLength + 0x0F) & ~0x0F
dataToEncrypt += file.fileName
dataToEncrypt += b"\0" * (alignedSize-file.fileNameLength)
fileDescLength = len(dataToEncrypt)
tmpFile.write(file.fileName)
tmpFile.write(b"\0" * (alignedSize-file.fileNameLength))
fileDescLength = tmpFile.tell()
for file in files:
if not file.flags & 0xFF == TYPE_DIRECTORY:
path = os.path.join(folder, file.fileNameStr())
Expand All @@ -469,7 +490,7 @@ def pack(folder, contentid, outname=None):
break
digestOff += len(digest)
if appheader.appType == 8 and found:
dataToEncrypt += fileData[0:digestOff]
tmpFile.write(fileData[0:digestOff])

meta = EbootMeta()
meta.magic = 0x4E504400
Expand All @@ -486,20 +507,22 @@ def pack(folder, contentid, outname=None):
else:
meta.notXORKLSHA1[i] = (0 ^ meta.notSHA1[i] ^ 0xAA) & 0xFF
meta.nulls[i] = 0
dataToEncrypt += meta.pack()
dataToEncrypt += fileData[digestOff + 0x80:]
tmpFile.write(meta.pack())
tmpFile.write(fileData[digestOff + 0x80:])
else:
dataToEncrypt += fileData
tmpFile.write(fileData)
else:
dataToEncrypt += fileData
tmpFile.write(fileData)

dataToEncrypt += b'\0' * (((file.fileSize + 0x0F) & ~0x0F) - len(fileData))
header.dataSize = len(dataToEncrypt)
tmpFile.write(b'\0' * (((file.fileSize + 0x0F) & ~0x0F) - len(fileData)))
tmpFile.seek(0, 2)
header.dataSize = tmpFile.tell()
metaBlock.dataSize = header.dataSize
header.packageSize = header.dataSize + 0x1A0
head = header.pack()
qadigest.update(head)
qadigest.update(dataToEncrypt[0:fileDescLength])
tmpFile.seek(0)
qadigest.update(tmpFile.read(fileDescLength))
QA_Digest = qadigest.digest()

for i in range(0, 0x10):
Expand Down Expand Up @@ -539,8 +562,7 @@ def pack(folder, contentid, outname=None):
outFile.write(metaBlockSHAPadEnc)

context = keyToContext(header.QADigest)
encData = crypt(context, dataToEncrypt, header.dataSize)
outFile.write(encData)
cryptfile(context, tmpFile, outFile)
outFile.write(b'\0' * 0x60)
outFile.close()
print(header)
Expand Down