6 Commits

Author	SHA1	Message	Date
Fred Gylys-Colwell	8ae3759a7d	Correct AES bit size for generic crypto ... Merge from Widevine repo of http://go/wvgerrit/42402 This changes the AES key size back to 128 for keys that are not entitlment keys. bug: 72904259 test: unit tests Change-Id: I07cc56050cafb82c65b67c56df3f18d375047eb8	2018-02-06 12:10:49 -08:00
Fred Gylys-Colwell	8de7caf788	Fix entitlement keys encryption and content key loading. ... Merge from Widevine repo of http://go/wvgerrit/41831 Bug: 72418096 OEMCrypto14 entitlement keys failed decryption testing Test: in child CL Change-Id: Ie92c34edb6162fb1e4553c5364f478de189ab793	2018-01-30 00:03:29 -08:00
Fred Gylys-Colwell	979ed70c7b	Add Entitlement License to OEMCrypto ... This CL adds entitlement license features and moves cipher mode from LoadKeys to SelectKeys. Merge from Widevine repo of http://go/wvgerrit/41660 bug: 70334840 Entitlement License - cdm layer bug: 70334345 Entitlement License - reference code and unit tests test: Entitlement license unit tests pass. Change-Id: Ic7d7f42c15e6d83ef7fcfd8a866c778adc4c8095	2018-01-24 21:53:15 -08:00
Fred Gylys-Colwell	426e53bbbf	OEMCrypto Mock SRM functionality ... Merge from Widevine repo of http://go/wvgerrit/24730 This CL adds SRM functionality to the modable version of oemcrypto mock. This can be used for end-to-end testing. b/28955873 b/37353534 Change-Id: I2c6f513495ccfd42f7a3d7a3449db6f810563c04	2017-04-20 14:50:43 -07:00
Fred Gylys-Colwell	eeaaf311e1	Correct comments and nits from other reviews ... Merge from Widevine repo of http://go/wvgerrit/23436 This change is just comment changes: minor rewording and grammar fixes. Change-Id: I4cb2ef77715623fdb2567f5b504ffaceb937a480	2017-01-30 15:26:43 -08:00
Fred Gylys-Colwell	d06fa606c7	Refactor OEMCrypto Engine ... Merge from widevine repo of http://go/wvgerrit/23280 This CL moves some of the oemcrypto mock classes into their own files. There are no real code changes. Change-Id: I4e4a6a01d8e75051bc0eb2a5d58361c438c7f41b	2017-01-27 15:21:08 -08:00