Commit graph

55 commits

Author SHA1 Message Date
Patrick Uiterwijk f243c42828
Merge pull request #14 from puiterwijk/cifix
Fix CI
2021-12-08 11:49:59 +01:00
Patrick Uiterwijk 8bec269f71
Merge pull request #12 from puiterwijk/josekit
feat: switch to josekit
2021-12-08 11:49:10 +01:00
Patrick Uiterwijk 1ac3e2a99f
Fix CI
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2021-12-08 11:45:05 +01:00
Patrick Uiterwijk 3ef768fb98
Build as a separate step
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2021-12-08 11:31:28 +01:00
Patrick Uiterwijk 1ec0e4a83f
Merge pull request #13 from puiterwijk/ci
Add GitHub CI
2021-12-08 11:29:18 +01:00
Patrick Uiterwijk 8deda12467
Add GitHub CI
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2021-12-08 11:28:43 +01:00
Patrick Uiterwijk a0a194a0f9
Add GitHub CI
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2021-12-08 11:26:57 +01:00
Patrick Uiterwijk 0767310e85
feat: switch to josekit
This patch changes from using biscuit to josekit for JWE.
josekit uses OpenSSL for its crypto instead of ring.

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2021-12-08 11:18:55 +01:00
Patrick Uiterwijk 6bcb830067
Merge pull request #11 from fedora-iot/hashfix
fix: use hash for name oject hash alg
2021-12-06 16:28:04 +01:00
Patrick Uiterwijk 3811bffc67
fix: use hash for name oject hash alg
This makes sure we actually use the correct hash algorithm for name alg.

Fixes: #9
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2021-11-03 10:25:49 +01:00
Peter Robinson 7d9daa3b29
Merge pull request #8 from runcom/bump-v0.4.0
Bump to 0.4.0, bump policy to 0.5.1
2021-10-04 12:30:55 +01:00
Antonio Murdaca f2f15a9165
Bump to 0.4.1, bump policy to 0.5.1
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2021-10-04 13:29:56 +02:00
Peter Robinson 74a320c8d4
Merge pull request #6 from runcom/bump-tss-eapi
bump rust-rss-eapi to 6.1.1, tpm2-policy to 0.5.0
2021-10-01 15:39:15 +01:00
Antonio Murdaca dcfe2296b3
bump rust-rss-eapi to 6.1.1, tpm2-policy to 0.5.0
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2021-10-01 14:52:50 +02:00
Antonio Murdaca 7170369a14
Merge pull request #7 from puiterwijk/encrypt-decrypt-raw
fix: stop assuming the payload is utf8
2021-10-01 12:09:31 +02:00
Patrick Uiterwijk 3465c80729
fix: stop assuming the payload is utf8
Previously, we were expecting that the input is always utf8 encoded
text.
Since we just convert it to bytes, and print it back out as bytes, we
can just skip the unicode parsing, and accept any provided input.

Fixes: #5
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2021-09-29 13:46:49 +02:00
Peter Robinson 7d211518c1
Merge pull request #4 from nullr0ute/fix-tpm2-policy
Fix the tpm2-policy dep
2021-09-29 12:24:28 +01:00
Peter Robinson d785af756a Fix the tpm2-policy dep
The tpm2-policy 0.4.0 release has been published so no need to
rely on a local checkout.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
2021-04-06 12:51:48 +01:00
Patrick Uiterwijk 50babf9b9c Rebase on tss-esapi 5.0 and tpm2-policy 0.4
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2021-04-06 09:45:14 +02:00
Patrick Uiterwijk 8ac7857957 Remove extern crate statements
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-12-03 16:46:44 +00:00
Patrick Uiterwijk 480cf9fe29 Add test that no use_policy is not fatal yet
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-12-03 16:45:18 +00:00
Patrick Uiterwijk b78c7d53ed Bump version to 0.2.0
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-12-03 16:43:25 +00:00
Patrick Uiterwijk 3dcb2874e0 Add defaults for policy path and pubkey path
This should send people strongly to use the defaults, so that other
tools can easily determine whether policies are in use and what their
values are.
It still allows overriding them.

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-12-03 16:42:52 +00:00
Patrick Uiterwijk 9f19dfa344 Rebase on tpm2-policy 0.3.1 for a fix
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-12-03 16:59:52 +01:00
Patrick Uiterwijk 130876f40a Re-enable the tests
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-12-03 14:30:58 +00:00
Patrick Uiterwijk 176f387e5c Bump version to 0.1.5
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-12-03 14:28:59 +00:00
Patrick Uiterwijk ec1770cdb5 Rebase on tss-esapi 4.0.10-alpha and tpm2-policy 0.3.0
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-12-03 14:28:06 +00:00
Patrick Uiterwijk 14d91c28d1 Reformat code with rust fmt
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-11-10 10:54:34 +01:00
Patrick Uiterwijk 06b2cd9335 Add fix for extra argument from clevis v15
Clevis v15 added an additional argument, which is either an empty string
or the string "-y".
This argument is not used in this PIN, but we checked the exact number of
arguments to parse, which got changed.
This also accepts more additional arguments, and just ignores them.

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-11-10 10:54:01 +01:00
Patrick Uiterwijk e2f32d0fa0 Support some more weird pcr_id specifications
This change makes it pass all the different possible values provided by the clevis tpm2
pin test suite.

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-27 14:04:33 +02:00
Patrick Uiterwijk 6a37627500 Test symlinked encrypt and decrypt
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-25 13:11:46 +02:00
Patrick Uiterwijk f5d2710e10 Add crates metadata
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-21 10:00:04 +02:00
Patrick Uiterwijk b7f8d115a7 Use u32 for 32-bit architectures
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-21 09:52:36 +02:00
Patrick Uiterwijk a0420fb4e0 Bump version to 0.1.1
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-13 10:43:18 +02:00
Patrick Uiterwijk d2aa6b3d9e Rebase to tss-esapi-4.0.6 and tpm2-policy-0.2.0
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-13 10:42:18 +02:00
Patrick Uiterwijk e10391c4fb Split some code into different files
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-03 17:07:04 +02:00
Patrick Uiterwijk 387826aef7 Move tpm_objects functions to other module
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-03 16:47:21 +02:00
Patrick Uiterwijk 98ae987519 Use the kernel TABRMD
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-03 15:42:07 +02:00
Patrick Uiterwijk cac6aacde4 Strip out the Policy components into a separate crate
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-03 12:11:43 +02:00
Patrick Uiterwijk 76e880d806 Add a --help option
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-03 11:03:36 +02:00
Patrick Uiterwijk 2a9a579033 Use the Device TCTI if there is no TPMRM
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-03 10:57:12 +02:00
Patrick Uiterwijk 8c1524f1b9 Add --sumary and help for compatibility with old pin
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-03 10:52:05 +02:00
Patrick Uiterwijk 83468f3028 Fix comments for rsa test
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-03 10:04:24 +02:00
Patrick Uiterwijk 874c0b3def Add RSA key tests
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-08-03 09:42:39 +02:00
Patrick Uiterwijk ccc7a94d56 Use biscuit 0.5.0-beta2
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-07-22 17:21:35 +02:00
Patrick Uiterwijk 8f8397c94f Remove broken and working policy
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-07-22 17:21:15 +02:00
Patrick Uiterwijk e22aedfe7a Generate a new key and signed policy during the test
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-07-22 16:46:54 +02:00
Patrick Uiterwijk 5abd766c06 Add some policy instructions to the README
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-07-22 16:38:36 +02:00
Patrick Uiterwijk bf48fcbd07 Redo tests to add second PCR and commit privkey
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-07-22 16:30:36 +02:00
Patrick Uiterwijk 2313184c9e Add sha1 pcr tests
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2020-07-22 09:54:09 +02:00