mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce code duplication

Browse source 
by re-using methods for extracting and verifying certificate
This commit is contained in:
Torsten Grote 2017-04-03 09:23:06 -03:00
parent a23da47118
commit 7c34dd96f4
No known key found for this signature in database
GPG key ID: 3E5F77D92CF891FF
3 changed files with 28 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

20
fdroidserver/index.py
View file

@ -36,8 +36,6 @@ from datetime import datetime
from xml.dom.minidom import Document
import requests
from pyasn1.codec.der import decoder, encoder
from pyasn1_modules import rfc2315
from fdroidserver import metadata, signindex, common
from fdroidserver.common import FDroidPopen, FDroidPopenBytes
@ -621,23 +619,7 @@ def get_public_key_from_jar(jar):
raise VerificationException("Found multiple signing certificates for repository.")
# extract public key from certificate
public_key = get_public_key_from_certificate(jar.read(certs[0]))
public_key = common.get_certificate(jar.read(certs[0]))
public_key_fingerprint = common.get_cert_fingerprint(public_key).replace(' ', '')
return public_key, public_key_fingerprint
def get_public_key_from_certificate(certificate_file):
"""
Extracts a public key from the given certificate.
:param certificate_file: file bytes (as string) representing the certificate
:return: A binary representation of the certificate's public key
"""
content = decoder.decode(certificate_file, asn1Spec=rfc2315.ContentInfo())[0]
if content.getComponentByName('contentType') != rfc2315.signedData:
raise VerificationException("Unexpected certificate format.")
content = decoder.decode(content.getComponentByName('content'),
asn1Spec=rfc2315.SignedData())[0]
certificates = content.getComponentByName('certificates')
cert = certificates[0].getComponentByName('certificate')
return encoder.encode(cert)