search

tpm2dev / tpm.dev.docker

Docker image for TPM 2.0 development from TPM.dev
https://tpm.dev
MIT License
10 stars 5 forks source link

added tpm2pkcs11,openssl and totp #6

Open iolivergithub opened 3 years ago

iolivergithub commented 3 years ago

Check the updated dockerfile from the main tpm.dev repo ... I've added stuff to the end but there have been changes to the WolfSSL stuff And the inclusion of the 'acl' library by Dimi today

tomoveu commented 3 years ago

@iolivergithub having tpm2-pkcs11 and totp is nice.

I want to accept this PR, but GitHub reports a merge conflict and does not allow me to merge the PR in its current state.

It seems you've made changes based on an older version of Docker.release. Please make sure you have the latest master branch before making changes and update this PR.

git fetch
git checkout -b latest --track origin/master

Instead of latest, you could name the branch to represent the features you are adding, for example "add-tpm2pkcs11". Brief example of this https://www.youtube.com/watch?v=JUpKDkb4Zhc

Another way to fix the merge conflict is to rebase your current changes on top of latest master, example of this https://www.youtube.com/watch?v=dqVqMwLzOjU&t=126s