summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-05-15 16:42:06 -0400
committerTom Rini <trini@konsulko.com>2020-05-15 16:42:06 -0400
commit506159549df76034dfbdee562304ce4c102d3a06 (patch)
tree85c116fc3267a1ce16d6771f0a08675788d48ccd /doc
parent5f09f9af3cc335fe6a74c031cfa0b1d8bdf4b9db (diff)
parent24bf6e84ce22cd1b53cb79e4f89a4036af7e9c6b (diff)
Merge branch '2020-05-15-misc-bugfixes'
- A number of symbol name consistency updates - JFFS2 bugfix - Use /* fallthrough */ for now to help at least gcc know when we're intentionally not 'break;'ing in a switch statement, we'll adopt fallthrough; later on. - Assorted other fixes
Diffstat (limited to 'doc')
-rw-r--r--doc/uImage.FIT/signature.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/uImage.FIT/signature.txt b/doc/uImage.FIT/signature.txt
index 3591225a6e..d4afd755e9 100644
--- a/doc/uImage.FIT/signature.txt
+++ b/doc/uImage.FIT/signature.txt
@@ -481,12 +481,14 @@ openssl. This may require setting up LD_LIBRARY_PATH if engine is not installed
to openssl's default search paths.
PKCS11 engine support forms "key id" based on "keydir" and with
-"key-name-hint". "key-name-hint" is used as "object" name and "keydir" if
-defined is used to define (prefix for) which PKCS11 source is being used for
-lookup up for the key.
+"key-name-hint". "key-name-hint" is used as "object" name (if not defined in
+keydir). "keydir" (if defined) is used to define (prefix for) which PKCS11 source
+is being used for lookup up for the key.
PKCS11 engine key ids:
"pkcs11:<keydir>;object=<key-name-hint>;type=<public|private>"
+or, if keydir contains "object="
+ "pkcs11:<keydir>;type=<public|private>"
or
"pkcs11:object=<key-name-hint>;type=<public|private>",