mirror of
				https://github.com/f-droid/fdroidserver.git
				synced 2025-11-04 06:30:27 +03:00 
			
		
		
		
	Replace custom code by verify_jar_signature()
This commit is contained in:
		
							parent
							
								
									623c5b6613
								
							
						
					
					
						commit
						beed746740
					
				
					 1 changed files with 4 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -3748,11 +3748,11 @@ def load_stats_fdroid_signing_key_fingerprints():
 | 
			
		|||
    jar_file = os.path.join('stats', 'publishsigkeys.jar')
 | 
			
		||||
    if not os.path.isfile(jar_file):
 | 
			
		||||
        return {}
 | 
			
		||||
    cmd = [config['jarsigner'], '-strict', '-verify', jar_file]
 | 
			
		||||
    p = FDroidPopen(cmd, output=False)
 | 
			
		||||
    if p.returncode != 4:
 | 
			
		||||
    try:
 | 
			
		||||
        verify_jar_signature(jar_file)
 | 
			
		||||
    except VerificationException as e:
 | 
			
		||||
        raise FDroidException("Signature validation of '{}' failed! "
 | 
			
		||||
                              "Please run publish again to rebuild this file.".format(jar_file))
 | 
			
		||||
                              "Please run publish again to rebuild this file.".format(jar_file)) from e
 | 
			
		||||
 | 
			
		||||
    jar_sigkey = apk_signer_fingerprint(jar_file)
 | 
			
		||||
    repo_key_sig = config.get('repo_key_sha256')
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue