Gitiles
Code Review Sign In
gerrit.openfyde.cn / chromium.googlesource.com / chromiumos / third_party / tpm2 / 65994903e1952a74a93485e11edfec97d556d076
commit65994903e1952a74a93485e11edfec97d556d076[log] [tgz]
authorNamyoon Woo <namyoon@chromium.org>Thu Oct 31 10:38:51 2019 -0700
committerCommit Bot <commit-bot@chromium.org>Sat Dec 07 06:25:18 2019 +0000
treec3122da92089d667321aa749093271f963bbf44b
parentdc6f6694681cde27a23134c58da37bada87dd9c8 [diff]
tpm2: support for extended TPM commands

This patch allows tpm2 library to support non-standard
TPM command codes, which start from 0x20008001.

This patch increases the flash usage by 32 bytes.

BUG=b:140527213
TEST=built the cr50 image with crrev.com/c/1891523,
and tested it with trunksd from crrev.com/c/1890846.

Sent a extended command of the code 0x20008001, which is marked as
not implemented. From console output, checked that Cr50 received
0x20008001 command and processed it as TPM_RC_COMMAND_CODE error,
which means 'Unsupported command code'.

// Send an empty 0x20008001 command code.
// - A key was already loaded, and its handle is 0x8000000.
// - A session was started, and its handle is 0x0300000
$ trunks_send --raw 8001 00000012 20008001 80000000 03000000
8001 0000000A 00000143
              ^^^^^^^^
	      TPM_RC_COMMAND_CODE

Change-Id: I2e8d116f2f9c1d2f9e09d220ebf0b2fcd46aad02
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/tpm2/+/1893681
Tested-by: Namyoon Woo <namyoon@chromium.org>
Commit-Queue: Namyoon Woo <namyoon@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
9 files changed
tree: c3122da92089d667321aa749093271f963bbf44b
  1. fuzz/
  2. generator/
  3. .gitignore
  4. _TPM_Hash_Data.c
  5. _TPM_Hash_Data_fp.h
  6. _TPM_Hash_End.c
  7. _TPM_Hash_End_fp.h
  8. _TPM_Hash_Start.c
  9. _TPM_Hash_Start_fp.h
  10. _TPM_Init.c
  11. _TPM_Init_fp.h
  12. ActivateCredential.c
  13. ActivateCredential_fp.h
  14. AlgorithmCap.c
  15. AlgorithmCap_fp.h
  16. Attest_spt.c
  17. Attest_spt_fp.h
  18. BaseTypes.h
  19. Bits.c
  20. bits.h
  21. Bits_fp.h
  22. bool.h
  23. Cancel.c
  24. Capabilities.h
  25. Certify.c
  26. Certify_fp.h
  27. CertifyCreation.c
  28. CertifyCreation_fp.h
  29. ChangeEPS.c
  30. ChangeEPS_fp.h
  31. ChangePPS.c
  32. ChangePPS_fp.h
  33. Clear.c
  34. Clear_fp.h
  35. ClearControl.c
  36. ClearControl_fp.h
  37. Clock.c
  38. ClockRateAdjust.c
  39. ClockRateAdjust_fp.h
  40. ClockSet.c
  41. ClockSet_fp.h
  42. CommandAttributeData.c
  43. CommandAudit.c
  44. CommandAudit_fp.h
  45. CommandCodeAttributes.c
  46. CommandCodeAttributes_fp.h
  47. CommandDispatcher.c
  48. CommandDispatcher_fp.h
  49. Commands_fp.h
  50. COMMIT-QUEUE.ini
  51. Commit.c
  52. Commit_fp.h
  53. Context_spt.c
  54. Context_spt_fp.h
  55. ContextLoad.c
  56. ContextLoad_fp.h
  57. ContextSave.c
  58. ContextSave_fp.h
  59. CpriCryptPri.c
  60. CpriCryptPri_fp.h
  61. CpriDataEcc.c
  62. CpriDataEcc.h
  63. CpriECC.c
  64. CpriECC_fp.h
  65. CpriHash.c
  66. CpriHash_fp.h
  67. CpriHashData.c
  68. CpriMisc.c
  69. CpriMisc_fp.h
  70. CpriRNG.c
  71. CpriRNG_fp.h
  72. CpriRSA.c
  73. CpriRSA_fp.h
  74. CpriSym.c
  75. CpriSym_fp.h
  76. Create.c
  77. Create_fp.h
  78. CreatePrimary.c
  79. CreatePrimary_fp.h
  80. CryptoEngine.h
  81. CryptSelfTest.c
  82. CryptSelfTest_fp.h
  83. CryptUtil.c
  84. CryptUtil_fp.h
  85. DA.c
  86. DA_fp.h
  87. DictionaryAttackLockReset.c
  88. DictionaryAttackLockReset_fp.h
  89. DictionaryAttackParameters.c
  90. DictionaryAttackParameters_fp.h
  91. DRTM.c
  92. Duplicate.c
  93. Duplicate_fp.h
  94. EC_Ephemeral.c
  95. EC_Ephemeral_fp.h
  96. ECC_Parameters.c
  97. ECC_Parameters_fp.h
  98. ECDH_KeyGen.c
  99. ECDH_KeyGen_fp.h
  100. ECDH_ZGen.c
  101. ECDH_ZGen_fp.h
  102. EncryptDecrypt.c
  103. EncryptDecrypt_fp.h
  104. Entity.c
  105. Entity_fp.h
  106. Entropy.c
  107. EventSequenceComplete.c
  108. EventSequenceComplete_fp.h
  109. EvictControl.c
  110. EvictControl_fp.h
  111. ExecCommand.c
  112. ExecCommand_fp.h
  113. FieldUpgradeData.c
  114. FieldUpgradeData_fp.h
  115. FieldUpgradeStart.c
  116. FieldUpgradeStart_fp.h
  117. FirmwareRead.c
  118. FirmwareRead_fp.h
  119. FlushContext.c
  120. FlushContext_fp.h
  121. GetCapability.c
  122. GetCapability_fp.h
  123. GetCommandAuditDigest.c
  124. GetCommandAuditDigest_fp.h
  125. GetCommandCodeString.c
  126. GetCommandCodeString_fp.h
  127. GetRandom.c
  128. GetRandom_fp.h
  129. GetSessionAuditDigest.c
  130. GetSessionAuditDigest_fp.h
  131. GetTestResult.c
  132. GetTestResult_fp.h
  133. GetTime.c
  134. GetTime_fp.h
  135. Global.c
  136. Global.h
  137. Handle.c
  138. Handle_fp.h
  139. HandleProcess.c
  140. HandleProcess_fp.h
  141. Hash.c
  142. Hash_fp.h
  143. HashSequenceStart.c
  144. HashSequenceStart_fp.h
  145. Hierarchy.c
  146. Hierarchy_fp.h
  147. HierarchyChangeAuth.c
  148. HierarchyChangeAuth_fp.h
  149. HierarchyControl.c
  150. HierarchyControl_fp.h
  151. HMAC.c
  152. HMAC_fp.h
  153. HMAC_Start.c
  154. HMAC_Start_fp.h
  155. Implementation.h
  156. Import.c
  157. Import_fp.h
  158. IncrementalSelfTest.c
  159. IncrementalSelfTest_fp.h
  160. InternalRoutines.h
  161. libtpm2.pc.in
  162. LICENSE
  163. Load.c
  164. Load_fp.h
  165. LoadExternal.c
  166. LoadExternal_fp.h
  167. Locality.c
  168. Locality_fp.h
  169. LocalityPlat.c
  170. MakeCredential.c
  171. MakeCredential_fp.h
  172. Makefile
  173. Manufacture.c
  174. Manufacture_fp.h
  175. Marshal_ActivateCredential.c
  176. Marshal_Certify.c
  177. Marshal_CertifyCreation.c
  178. Marshal_ChangeEPS.c
  179. Marshal_ChangePPS.c
  180. Marshal_Clear.c
  181. Marshal_ClearControl.c
  182. Marshal_ClockRateAdjust.c
  183. Marshal_ClockSet.c
  184. Marshal_Commit.c
  185. Marshal_ContextLoad.c
  186. Marshal_ContextSave.c
  187. Marshal_Create.c
  188. Marshal_CreatePrimary.c
  189. Marshal_DictionaryAttackLockReset.c
  190. Marshal_DictionaryAttackParameters.c
  191. Marshal_Duplicate.c
  192. Marshal_EC_Ephemeral.c
  193. Marshal_ECC_Parameters.c
  194. Marshal_ECDH_KeyGen.c
  195. Marshal_ECDH_ZGen.c
  196. Marshal_EncryptDecrypt.c
  197. Marshal_EventSequenceComplete.c
  198. Marshal_EvictControl.c
  199. Marshal_FieldUpgradeData.c
  200. Marshal_FieldUpgradeStart.c
  201. Marshal_FirmwareRead.c
  202. Marshal_FlushContext.c
  203. marshal_fp.h
  204. Marshal_GetCapability.c
  205. Marshal_GetCommandAuditDigest.c
  206. Marshal_GetRandom.c
  207. Marshal_GetSessionAuditDigest.c
  208. Marshal_GetTestResult.c
  209. Marshal_GetTime.c
  210. Marshal_Hash.c
  211. Marshal_HashSequenceStart.c
  212. Marshal_HierarchyChangeAuth.c
  213. Marshal_HierarchyControl.c
  214. Marshal_HMAC.c
  215. Marshal_HMAC_Start.c
  216. Marshal_Import.c
  217. Marshal_IncrementalSelfTest.c
  218. Marshal_Load.c
  219. Marshal_LoadExternal.c
  220. Marshal_MakeCredential.c
  221. Marshal_NV_Certify.c
  222. Marshal_NV_ChangeAuth.c
  223. Marshal_NV_DefineSpace.c
  224. Marshal_NV_Extend.c
  225. Marshal_NV_GlobalWriteLock.c
  226. Marshal_NV_Increment.c
  227. Marshal_NV_Read.c
  228. Marshal_NV_ReadLock.c
  229. Marshal_NV_ReadPublic.c
  230. Marshal_NV_SetBits.c
  231. Marshal_NV_UndefineSpace.c
  232. Marshal_NV_UndefineSpaceSpecial.c
  233. Marshal_NV_Write.c
  234. Marshal_NV_WriteLock.c
  235. Marshal_ObjectChangeAuth.c
  236. Marshal_PCR_Allocate.c
  237. Marshal_PCR_Event.c
  238. Marshal_PCR_Extend.c
  239. Marshal_PCR_Read.c
  240. Marshal_PCR_Reset.c
  241. Marshal_PCR_SetAuthPolicy.c
  242. Marshal_PCR_SetAuthValue.c
  243. Marshal_PolicyAuthorize.c
  244. Marshal_PolicyAuthValue.c
  245. Marshal_PolicyCommandCode.c
  246. Marshal_PolicyCounterTimer.c
  247. Marshal_PolicyCpHash.c
  248. Marshal_PolicyDuplicationSelect.c
  249. Marshal_PolicyGetDigest.c
  250. Marshal_PolicyLocality.c
  251. Marshal_PolicyNameHash.c
  252. Marshal_PolicyNV.c
  253. Marshal_PolicyNvWritten.c
  254. Marshal_PolicyOR.c
  255. Marshal_PolicyPassword.c
  256. Marshal_PolicyPCR.c
  257. Marshal_PolicyPhysicalPresence.c
  258. Marshal_PolicyRestart.c
  259. Marshal_PolicySecret.c
  260. Marshal_PolicySigned.c
  261. Marshal_PolicyTicket.c
  262. Marshal_PP_Commands.c
  263. Marshal_Quote.c
  264. Marshal_ReadClock.c
  265. Marshal_ReadPublic.c
  266. Marshal_Rewrap.c
  267. Marshal_RSA_Decrypt.c
  268. Marshal_RSA_Encrypt.c
  269. Marshal_SelfTest.c
  270. Marshal_SequenceComplete.c
  271. Marshal_SequenceUpdate.c
  272. Marshal_SetAlgorithmSet.c
  273. Marshal_SetCommandCodeAuditStatus.c
  274. Marshal_SetPrimaryPolicy.c
  275. Marshal_Shutdown.c
  276. Marshal_Sign.c
  277. Marshal_StartAuthSession.c
  278. Marshal_Startup.c
  279. Marshal_StirRandom.c
  280. marshal_test.c
  281. Marshal_TestParms.c
  282. Marshal_Unseal.c
  283. Marshal_VerifySignature.c
  284. Marshal_ZGen_2Phase.c
  285. MathFunctions.c
  286. MathFunctions_fp.h
  287. MemoryLib.c
  288. MemoryLib_fp.h
  289. NV.c
  290. NV_Certify.c
  291. NV_Certify_fp.h
  292. NV_ChangeAuth.c
  293. NV_ChangeAuth_fp.h
  294. NV_DefineSpace.c
  295. NV_DefineSpace_fp.h
  296. NV_Extend.c
  297. NV_Extend_fp.h
  298. NV_fp.h
  299. NV_GlobalWriteLock.c
  300. NV_GlobalWriteLock_fp.h
  301. NV_Increment.c
  302. NV_Increment_fp.h
  303. NV_Read.c
  304. NV_Read_fp.h
  305. NV_ReadLock.c
  306. NV_ReadLock_fp.h
  307. NV_ReadPublic.c
  308. NV_ReadPublic_fp.h
  309. NV_SetBits.c
  310. NV_SetBits_fp.h
  311. NV_spt.c
  312. NV_spt_fp.h
  313. NV_UndefineSpace.c
  314. NV_UndefineSpace_fp.h
  315. NV_UndefineSpaceSpecial.c
  316. NV_UndefineSpaceSpecial_fp.h
  317. NV_Write.c
  318. NV_Write_fp.h
  319. NV_WriteLock.c
  320. NV_WriteLock_fp.h
  321. NVMem.c
  322. Object.c
  323. Object_fp.h
  324. Object_spt.c
  325. Object_spt_fp.h
  326. ObjectChangeAuth.c
  327. ObjectChangeAuth_fp.h
  328. OsslCryptoEngine.h
  329. OWNERS
  330. parsep3
  331. parsep4
  332. PCR.c
  333. PCR_Allocate.c
  334. PCR_Allocate_fp.h
  335. PCR_Event.c
  336. PCR_Event_fp.h
  337. PCR_Extend.c
  338. PCR_Extend_fp.h
  339. PCR_fp.h
  340. PCR_Read.c
  341. PCR_Read_fp.h
  342. PCR_Reset.c
  343. PCR_Reset_fp.h
  344. PCR_SetAuthPolicy.c
  345. PCR_SetAuthPolicy_fp.h
  346. PCR_SetAuthValue.c
  347. PCR_SetAuthValue_fp.h
  348. Platform.h
  349. PlatformData.c
  350. PlatformData.h
  351. Policy_spt.c
  352. Policy_spt_fp.h
  353. PolicyAuthorize.c
  354. PolicyAuthorize_fp.h
  355. PolicyAuthValue.c
  356. PolicyAuthValue_fp.h
  357. PolicyCommandCode.c
  358. PolicyCommandCode_fp.h
  359. PolicyCounterTimer.c
  360. PolicyCounterTimer_fp.h
  361. PolicyCpHash.c
  362. PolicyCpHash_fp.h
  363. PolicyDuplicationSelect.c
  364. PolicyDuplicationSelect_fp.h
  365. PolicyGetDigest.c
  366. PolicyGetDigest_fp.h
  367. PolicyLocality.c
  368. PolicyLocality_fp.h
  369. PolicyNameHash.c
  370. PolicyNameHash_fp.h
  371. PolicyNV.c
  372. PolicyNV_fp.h
  373. PolicyNvWritten.c
  374. PolicyNvWritten_fp.h
  375. PolicyOR.c
  376. PolicyOR_fp.h
  377. PolicyPassword.c
  378. PolicyPassword_fp.h
  379. PolicyPCR.c
  380. PolicyPCR_fp.h
  381. PolicyPhysicalPresence.c
  382. PolicyPhysicalPresence_fp.h
  383. PolicyRestart.c
  384. PolicyRestart_fp.h
  385. PolicySecret.c
  386. PolicySecret_fp.h
  387. PolicySigned.c
  388. PolicySigned_fp.h
  389. PolicyTicket.c
  390. PolicyTicket_fp.h
  391. Power.c
  392. Power_fp.h
  393. PowerPlat.c
  394. PP.c
  395. PP_Commands.c
  396. PP_Commands_fp.h
  397. PP_fp.h
  398. PPPlat.c
  399. PRESUBMIT.cfg
  400. PropertyCap.c
  401. PropertyCap_fp.h
  402. Quote.c
  403. Quote_fp.h
  404. ReadClock.c
  405. ReadClock_fp.h
  406. README
  407. ReadPublic.c
  408. ReadPublic_fp.h
  409. Rewrap.c
  410. Rewrap_fp.h
  411. RSA_Decrypt.c
  412. RSA_Decrypt_fp.h
  413. RSA_Encrypt.c
  414. RSA_Encrypt_fp.h
  415. RSAData.c
  416. RSAKeySieve.c
  417. RSAKeySieve.h
  418. RSAKeySieve_fp.h
  419. SelfTest.c
  420. SelfTest_fp.h
  421. SequenceComplete.c
  422. SequenceComplete_fp.h
  423. SequenceUpdate.c
  424. SequenceUpdate_fp.h
  425. Session.c
  426. Session_fp.h
  427. SessionProcess.c
  428. SessionProcess_fp.h
  429. SetAlgorithmSet.c
  430. SetAlgorithmSet_fp.h
  431. SetCommandCodeAuditStatus.c
  432. SetCommandCodeAuditStatus_fp.h
  433. SetPrimaryPolicy.c
  434. SetPrimaryPolicy_fp.h
  435. Shutdown.c
  436. Shutdown_fp.h
  437. Sign.c
  438. Sign_fp.h
  439. StartAuthSession.c
  440. StartAuthSession_fp.h
  441. Startup.c
  442. Startup_fp.h
  443. StirRandom.c
  444. StirRandom_fp.h
  445. stubs_ecc.c
  446. stubs_hash.c
  447. stubs_sym.c
  448. swap.h
  449. TcpServer.c
  450. TestParms.c
  451. TestParms_fp.h
  452. thirdparty_preinstall.sh
  453. Ticket.c
  454. Ticket_fp.h
  455. Time.c
  456. Time_fp.h
  457. Tpm.h
  458. tpm_generated.c
  459. tpm_generated.h
  460. TPM_Types.h
  461. tpm_types.h
  462. TPMB.h
  463. TpmBuildSwitches.h
  464. TPMCmdp.c
  465. TPMCmds.c
  466. TpmError.h
  467. TpmFail.c
  468. TpmFail_fp.h
  469. TpmTcpProtocol.h
  470. Unique.c
  471. Unique_fp.h
  472. Unseal.c
  473. Unseal_fp.h
  474. VendorString.h
  475. VerifySignature.c
  476. VerifySignature_fp.h
  477. ZGen_2Phase.c
  478. ZGen_2Phase_fp.h