widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I2887c18f,I8ea5d0fd

Browse Source 
* changes:
  Use size_t for length in wvcrc32
  Update OEM Certificate scripts for Python 3
This commit is contained in:
TreeHugger Robot
2021-10-06 21:54:13 +00:00
committed by Android (Google) Code Review
parent fdea46d325 bbb023db26
commit 6be8cc6b12
3 changed files with 66 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libwvdrmengine/oem_certificate_generator/oem_certificate.py Normal file → Executable file
View File

@@ -1,3 +1,4 @@
#!/usr/bin/python3
# Copyright 2017 Google LLC. All Rights Reserved. # Copyright 2017 Google LLC. All Rights Reserved.
"""OEM certificate generation tool. """OEM certificate generation tool.
@@ -110,7 +111,7 @@ class X509CertificateChain(object):
x509_stack = pkcs7.d.sign.cert x509_stack = pkcs7.d.sign.cert
certificates = [] certificates = []
for i in xrange(backend._lib.sk_X509_num(x509_stack)): for i in range(backend._lib.sk_X509_num(x509_stack)):
x509_value = backend._ffi.gc( x509_value = backend._ffi.gc(
backend._lib.X509_dup(backend._lib.sk_X509_value(x509_stack, i)), backend._lib.X509_dup(backend._lib.sk_X509_value(x509_stack, i)),
backend._lib.X509_free) backend._lib.X509_free)
@@ -134,6 +135,10 @@ class X509CertificateChain(object):
return backend._read_mem_bio(bio) return backend._read_mem_bio(bio)
# Type for argparse to accept byte buffers on the command line
def utf8_bytes(utf8_str):
return utf8_str.encode('utf-8')
def _multiple_of_1024(key_size_str): def _multiple_of_1024(key_size_str):
"""argparse custom type function for key size.""" """argparse custom type function for key size."""
key_size = int(key_size_str) key_size = int(key_size_str)
@@ -299,9 +304,9 @@ def generate_leaf_certificate(args):
def secure_erase(args): def secure_erase(args):
"""Subparser handler for secure erasing of a file.""" """Subparser handler for secure erasing of a file."""
length = args.file.tell() length = args.file.tell()
for _ in xrange(args.passes): for _ in range(args.passes):
args.file.seek(0) args.file.seek(0)
for _ in xrange(length): for _ in range(length):
args.file.write(os.urandom(1)) args.file.write(os.urandom(1))
args.file.close() args.file.close()
os.remove(args.file.name) os.remove(args.file.name)
@@ -403,6 +408,7 @@ def create_parser():
'--output_private_key_file', type=argparse.FileType('wb'), required=True) '--output_private_key_file', type=argparse.FileType('wb'), required=True)
parser_csr.add_argument( parser_csr.add_argument(
'--passphrase', '--passphrase',
type=utf8_bytes,
help=('specify an optional passphrase to encrypt the private key. The ' help=('specify an optional passphrase to encrypt the private key. The '
'private key is not encrypted if omitted.')) 'private key is not encrypted if omitted.'))
parser_csr.set_defaults(func=generate_csr) parser_csr.set_defaults(func=generate_csr)
@@ -429,7 +435,7 @@ def create_parser():
'--root_certificate_file', type=argparse.FileType('rb'), required=True) '--root_certificate_file', type=argparse.FileType('rb'), required=True)
parser_intermediate_cert.add_argument( parser_intermediate_cert.add_argument(
'--root_private_key_file', type=argparse.FileType('rb'), required=True) '--root_private_key_file', type=argparse.FileType('rb'), required=True)
parser_intermediate_cert.add_argument('--root_private_key_passphrase') parser_intermediate_cert.add_argument('--root_private_key_passphrase', type=utf8_bytes)
parser_intermediate_cert.add_argument( parser_intermediate_cert.add_argument(
'--output_certificate_file', type=argparse.FileType('wb'), required=True) '--output_certificate_file', type=argparse.FileType('wb'), required=True)
parser_intermediate_cert.set_defaults(func=generate_intermediate_certificate) parser_intermediate_cert.set_defaults(func=generate_intermediate_certificate)
@@ -460,13 +466,14 @@ def create_parser():
'--intermediate_private_key_file', '--intermediate_private_key_file',
type=argparse.FileType('rb'), type=argparse.FileType('rb'),
required=True) required=True)
parser_leaf_cert.add_argument('--intermediate_private_key_passphrase') parser_leaf_cert.add_argument('--intermediate_private_key_passphrase', type=utf8_bytes)
parser_leaf_cert.add_argument( parser_leaf_cert.add_argument(
'--output_certificate_file', type=argparse.FileType('wb'), required=True) '--output_certificate_file', type=argparse.FileType('wb'), required=True)
parser_leaf_cert.add_argument( parser_leaf_cert.add_argument(
'--output_private_key_file', type=argparse.FileType('wb'), required=True) '--output_private_key_file', type=argparse.FileType('wb'), required=True)
parser_leaf_cert.add_argument( parser_leaf_cert.add_argument(
'--passphrase', '--passphrase',
type=utf8_bytes,
help=('specify an optional passphrase to encrypt the private key. The ' help=('specify an optional passphrase to encrypt the private key. The '
'private key is not encrypted if omitted.')) 'private key is not encrypted if omitted.'))
parser_leaf_cert.set_defaults(func=generate_leaf_certificate) parser_leaf_cert.set_defaults(func=generate_leaf_certificate)
@@ -497,7 +504,7 @@ def main():
args = sys.argv[1:] args = sys.argv[1:]
config_file_name = 'oem_certificate.cfg' config_file_name = 'oem_certificate.cfg'
if os.path.isfile(config_file_name): if os.path.isfile(config_file_name):
print 'Load from args default configuration file: ', config_file_name print('Load from args default configuration file: ', config_file_name)
args.append('@' + config_file_name) args.append('@' + config_file_name)
parser_args = create_parser().parse_args(args) parser_args = create_parser().parse_args(args)
parser_args.func(parser_args) parser_args.func(parser_args)

120
libwvdrmengine/oemcrypto/test/wvcrc.cpp
View File

@@ -11,73 +11,52 @@ namespace wvoec {
#define INIT_CRC32 0xffffffff #define INIT_CRC32 0xffffffff
uint32_t wvrunningcrc32(const uint8_t* p_begin, int i_count, uint32_t i_crc) { uint32_t wvrunningcrc32(const uint8_t* p_begin, size_t i_count,
static uint32_t CRC32[256] = { uint32_t i_crc) {
0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, constexpr uint32_t CRC32[256] = {
0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005, 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, 0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75, 0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3,
0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd, 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef,
0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb,
0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81, 0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d, 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95, 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4,
0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, 0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08,
0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae, 0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072, 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc,
0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca, 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050,
0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, 0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066, 0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba, 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1,
0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692, 0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5,
0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, 0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9,
0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e, 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, 0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd,
0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a, 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2,
0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, 0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53, 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e,
0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b, 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a,
0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676,
0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, 0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b, 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4};
0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b,
0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f,
0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c,
0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24,
0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30,
0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088,
0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654,
0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c,
0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0,
0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c,
0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
};
/* Calculate the CRC */ /* Calculate the CRC */
while (i_count > 0) { while (i_count > 0) {
@@ -89,7 +68,7 @@ uint32_t wvrunningcrc32(const uint8_t* p_begin, int i_count, uint32_t i_crc) {
return(i_crc); return(i_crc);
} }
uint32_t wvcrc32(const uint8_t* p_begin, int i_count) { uint32_t wvcrc32(const uint8_t* p_begin, size_t i_count) {
return(wvrunningcrc32(p_begin, i_count, INIT_CRC32)); return(wvrunningcrc32(p_begin, i_count, INIT_CRC32));
} }
@@ -97,11 +76,12 @@ uint32_t wvcrc32Init() {
return INIT_CRC32; return INIT_CRC32;
} }
uint32_t wvcrc32Cont(const uint8_t* p_begin, int i_count, uint32_t prev_crc) { uint32_t wvcrc32Cont(const uint8_t* p_begin, size_t i_count,
uint32_t prev_crc) {
return(wvrunningcrc32(p_begin, i_count, prev_crc)); return(wvrunningcrc32(p_begin, i_count, prev_crc));
} }
uint32_t wvcrc32n(const uint8_t* p_begin, int i_count) { uint32_t wvcrc32n(const uint8_t* p_begin, size_t i_count) {
return htonl(wvrunningcrc32(p_begin, i_count, INIT_CRC32)); return htonl(wvrunningcrc32(p_begin, i_count, INIT_CRC32));
} }

6
libwvdrmengine/oemcrypto/test/wvcrc32.h
View File

@@ -11,12 +11,12 @@
namespace wvoec { namespace wvoec {
uint32_t wvcrc32(const uint8_t* p_begin, int i_count); uint32_t wvcrc32(const uint8_t* p_begin, size_t i_count);
uint32_t wvcrc32Init(); uint32_t wvcrc32Init();
uint32_t wvcrc32Cont(const uint8_t* p_begin, int i_count, uint32_t prev_crc); uint32_t wvcrc32Cont(const uint8_t* p_begin, size_t i_count, uint32_t prev_crc);
// Convert to network byte order // Convert to network byte order
uint32_t wvcrc32n(const uint8_t* p_begin, int i_count); uint32_t wvcrc32n(const uint8_t* p_begin, size_t i_count);
} // namespace wvoec } // namespace wvoec