Merge pull request #44 from julesontheroad/Beta

Fixed bug in ticket verification
julesontheroad · Jun 2, 2019 · 9210c33 · 9210c33
2 parents 04f0a5c + fb6af8d
commit 9210c33
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/py/ztools/Fs/Nsp.py b/py/ztools/Fs/Nsp.py
@@ -6654,21 +6654,19 @@ def verify_nca_key(self,nca):
 		return check									
 
 	def verify_key(self,nca,ticket):
-		masterKeyRev=False
 		for file in self:
 			if type(file) == Nca:
-				if str(file._path) == nca:	
-					crypto1=file.header.getCryptoType()	
-					crypto2=file.header.getCryptoType2()		
-					if crypto1 == 2:
-						if crypto1 > crypto2:								
-							masterKeyRev=file.header.getCryptoType()
-						else:			
-							masterKeyRev=file.header.getCryptoType2()	
+				crypto1=file.header.getCryptoType()	
+				crypto2=file.header.getCryptoType2()					
+				if crypto1 == 2:
+					if crypto1 > crypto2:								
+						masterKeyRev=file.header.getCryptoType()
 					else:			
-						masterKeyRev=file.header.getCryptoType2()
-		if masterKeyRev == False:
-			return False
+						masterKeyRev=file.header.getCryptoType2()	
+				else:			
+					masterKeyRev=file.header.getCryptoType2()	
+				if str(file._path) == nca:						
+					break			
 
 		for file in self:
 			if type(file) == Ticket:

diff --git a/py/ztools/Fs/Xci.py b/py/ztools/Fs/Xci.py
@@ -6175,23 +6175,21 @@ def verify_nca_key(self,nca):
 		return check					
 
 	def verify_key(self,nca,ticket):
-		masterKeyRev=False
 		for nspF in self.hfs0:
 			if str(nspF._path)=="secure":
 				for file in nspF:
 					if type(file) == Nca:
-						if str(file._path) == nca:	
-							crypto1=file.header.getCryptoType()	
-							crypto2=file.header.getCryptoType2()		
-							if crypto1 == 2:
-								if crypto1 > crypto2:								
-									masterKeyRev=file.header.getCryptoType()
-								else:			
-									masterKeyRev=file.header.getCryptoType2()	
+						crypto1=file.header.getCryptoType()	
+						crypto2=file.header.getCryptoType2()					
+						if crypto1 == 2:
+							if crypto1 > crypto2:								
+								masterKeyRev=file.header.getCryptoType()
 							else:			
-								masterKeyRev=file.header.getCryptoType2()
-		if masterKeyRev == False:
-			return False
+								masterKeyRev=file.header.getCryptoType2()	
+						else:			
+							masterKeyRev=file.header.getCryptoType2()	
+						if str(file._path) == nca:						
+							break
 
 		for nspF in self.hfs0:
 			if str(nspF._path)=="secure":

diff --git a/py/ztools/Fs/__pycache__/Nsp.cpython-37.pyc b/py/ztools/Fs/__pycache__/Nsp.cpython-37.pyc
diff --git a/py/ztools/Fs/__pycache__/Xci.cpython-37.pyc b/py/ztools/Fs/__pycache__/Xci.cpython-37.pyc