aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-12-28 09:03:43 -0500
committerJack Lloyd <[email protected]>2016-12-28 09:03:43 -0500
commit6ca5a5bc8c73ecdbb37eb8a0d430f43b234f2787 (patch)
tree6623821737be7787e3fdc5d5701f0168ac597ae1 /doc
parent0f0b147f57fda3459143e71b4c1ff4444d27fdd3 (diff)
Address some review comments by @cordney in TPM doc
[ci skip]
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/tpm.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/manual/tpm.rst b/doc/manual/tpm.rst
index 9f6be8834..de9e170f8 100644
--- a/doc/manual/tpm.rst
+++ b/doc/manual/tpm.rst
@@ -28,9 +28,9 @@ using ``shared_ptr`` to remove this problem.
.. cpp:function:: TPM_Context(pin_cb cb, const char* srk_password)
- The PIN callback takes a std::string as an argument, which is
- an informative message for the user. It should return a string
- containing the PIN entered by the user.
+ The (somewhat improperly named) pin_cb callback type takes a std::string as
+ an argument, which is an informative message for the user. It should return
+ a string containing the password entered by the user.
Normally the SRK password is null. Use nullptr to signal this.
@@ -42,7 +42,7 @@ off, you can use it with ``TPM_RNG`` which implements the standard
.. cpp:function:: TPM_RNG(TPM_Context& ctx)
- Initialze a TPM RNG object. After initialization, reading from
+ Initialize a TPM RNG object. After initialization, reading from
this RNG reads from the hardware? RNG on the TPM.
The v1.2 TPM uses only RSA, but because this key is implemented completely in