openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "releasetools: Add a testcase for common.ParseCertificate()." 

am: a0f55ee9eb

Change-Id: Ibba4b572b75f470837f7026b131bdc83b5de5b58
This commit is contained in:
Tao Bao 2018-02-21 00:21:27 +00:00 committed by android-build-merger
parent 625b5b7a09 a0f55ee9eb
commit 9773a2f7b2
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/releasetools/common.py
View File

@ -1800,17 +1800,23 @@ def GetTypeAndDevice(mount_point, info):
def ParseCertificate(data): def ParseCertificate(data):
"""Parse a PEM-format certificate.""" """Parses and converts a PEM-encoded certificate into DER-encoded.
cert = []
This gives the same result as `openssl x509 -in <filename> -outform DER`.
Returns:
The decoded certificate string.
"""
cert_buffer = []
save = False save = False
for line in data.split("\n"): for line in data.split("\n"):
if "--END CERTIFICATE--" in line: if "--END CERTIFICATE--" in line:
break break
if save: if save:
cert.append(line) cert_buffer.append(line)
if "--BEGIN CERTIFICATE--" in line: if "--BEGIN CERTIFICATE--" in line:
save = True save = True
cert = "".join(cert).decode('base64') cert = "".join(cert_buffer).decode('base64')
return cert return cert

24
tools/releasetools/test_common.py
View File

@ -15,6 +15,7 @@
# #
import os import os
import subprocess
import tempfile import tempfile
import time import time
import unittest import unittest
@ -402,6 +403,9 @@ class CommonApkUtilsTest(unittest.TestCase):
'Compressed4.apk' : 'certs/compressed4', 'Compressed4.apk' : 'certs/compressed4',
} }
def setUp(self):
self.testdata_dir = test_utils.get_testdata_dir()
def tearDown(self): def tearDown(self):
common.Cleanup() common.Cleanup()
@ -479,17 +483,27 @@ class CommonApkUtilsTest(unittest.TestCase):
self.assertRaises(ValueError, common.ReadApkCerts, input_zip) self.assertRaises(ValueError, common.ReadApkCerts, input_zip)
def test_ExtractPublicKey(self): def test_ExtractPublicKey(self):
testdata_dir = test_utils.get_testdata_dir() cert = os.path.join(self.testdata_dir, 'testkey.x509.pem')
cert = os.path.join(testdata_dir, 'testkey.x509.pem') pubkey = os.path.join(self.testdata_dir, 'testkey.pubkey.pem')
pubkey = os.path.join(testdata_dir, 'testkey.pubkey.pem')
with open(pubkey, 'rb') as pubkey_fp: with open(pubkey, 'rb') as pubkey_fp:
self.assertEqual(pubkey_fp.read(), common.ExtractPublicKey(cert)) self.assertEqual(pubkey_fp.read(), common.ExtractPublicKey(cert))
def test_ExtractPublicKey_invalidInput(self): def test_ExtractPublicKey_invalidInput(self):
testdata_dir = test_utils.get_testdata_dir() wrong_input = os.path.join(self.testdata_dir, 'testkey.pk8')
wrong_input = os.path.join(testdata_dir, 'testkey.pk8')
self.assertRaises(AssertionError, common.ExtractPublicKey, wrong_input) self.assertRaises(AssertionError, common.ExtractPublicKey, wrong_input)
def test_ParseCertificate(self):
cert = os.path.join(self.testdata_dir, 'testkey.x509.pem')
cmd = ['openssl', 'x509', '-in', cert, '-outform', 'DER']
proc = common.Run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
expected, _ = proc.communicate()
self.assertEqual(0, proc.returncode)
with open(cert) as cert_fp:
actual = common.ParseCertificate(cert_fp.read())
self.assertEqual(expected, actual)
class CommonUtilsTest(unittest.TestCase): class CommonUtilsTest(unittest.TestCase):