Skip to content

Commit e493487

Browse files
authored
(xmlsec-docs) clarify --enabled-key-data usage (example: rsa,key-value,x509) and add FAQ note (#917)
1 parent afd9294 commit e493487

File tree

6 files changed

+18
-8
lines changed

6 files changed

+18
-8
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ docs/api/*.bak
6868
docs/api/*.types
6969
docs/api/sgml.stamp
7070
docs/html.stamp
71-
71+
.vscode/

apps/xmlsec.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
static const char copyright[] =
6060
"Written by Aleksey Sanin <[email protected]>.\n\n"
61-
"Copyright (C) 2002-2024 Aleksey Sanin <[email protected]>. All Rights Reserved..\n"
61+
"Copyright (C) 2002-2024 Aleksey Sanin <[email protected]>. All Rights Reserved.\n"
6262
"This is free software: see the source for copying information.\n";
6363

6464
static const char bugs[] =
@@ -484,9 +484,13 @@ static xmlSecAppCmdLineParam enabledKeyDataParam = {
484484
"--enabled-key-data",
485485
NULL,
486486
"--enabled-key-data <list>"
487-
"\n\tcomma separated list of enabled key data (list of "
488-
"\n\tregistered key data klasses is available with \"--list-key-data\""
489-
"\n\tcommand); by default, all registered key data are enabled",
487+
"\n\tcomma-separated list of key-data types to enable."
488+
"\n\tExample:"
489+
"\n\t rsa,key-value,x509 -> populates <RSAKeyValue> and keeps <X509Data>"
490+
"\n\t when <KeyValue/> and <X509Data/> placeholders"
491+
"\n\t are present in the template."
492+
"\n\tUse \"--list-key-data\" to view full list of registered key data klasses."
493+
"\n\tBy default, all registered key data are enabled.",
490494
xmlSecAppCmdLineParamTypeStringList,
491495
xmlSecAppCmdLineParamFlagParamNameValue | xmlSecAppCmdLineParamFlagMultipleValues,
492496
NULL

docs/faq.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,9 @@ <h4>
302302
re-enable <code>KeyValue</code> and <code>DEREncodedKeyValue</code> nodes using the <code>--enabled-key-data</code> option
303303
for the <a href="xmlsec-man.html">xmlsec command line utility</a>, or by setting the <code>keyInfoCtx-&gt;enabledKeyData</code>
304304
parameter in your application.
305+
For example, <code>--enabled-key-data rsa,key-value,x509</code> will populate an <code>&lt;RSAKeyValue&gt;</code> element (and keep
306+
<code>&lt;X509Data&gt;</code> enabled) when the template contains matching <code>&lt;KeyValue/&gt;</code> and
307+
<code>&lt;X509Data/&gt;</code> placeholders.
305308
<b>THIS IS NOT SECURE AND NOT RECOMMENDED.</b>
306309
</li>
307310
<li>

docs/xmlsec-man.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,10 @@ <h1>XMLSEC1</h1>
145145
</dd>
146146
<dt> <b>--enabled-key-data</b> &lt;list&gt; <dt></dt>
147147
</dt>
148-
<dd> <dd>comma separated list of enabled key data (list of registered key data klasses is available with "--list-key-data" command); by default, all registered key data are enabled </dd>
148+
<dd>comma-separated list of key-data types to enable.
149+
Use <code>--list-key-data</code> to see all registered key-data klasses.
150+
By default, all registered key data are enabled.<br>
151+
<b>Example:</b> <code>--enabled-key-data rsa,key-value,x509</code> populates an <code>&lt;RSAKeyValue&gt;</code> element (and keeps <code>&lt;X509Data&gt;</code> enabled) when the template contains the matching <code>&lt;KeyValue/&gt;</code> and <code>&lt;X509Data/&gt;</code> placeholders.</dd>
149152
</dd>
150153
<dt> <b>--enabled-retrieval-method-uris</b> &lt;list&gt; <dt></dt>
151154
</dt>

man/xmlsec1.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,6 @@ Written by Aleksey Sanin <[email protected]>.
355355
.SH "REPORTING BUGS"
356356
Report bugs to http://www.aleksey.com/xmlsec/bugs.html
357357
.SH COPYRIGHT
358-
Copyright \(co 2002\-2024 Aleksey Sanin <[email protected]>. All Rights Reserved..
358+
Copyright \(co 2002\-2024 Aleksey Sanin <[email protected]>. All Rights Reserved.
359359
.br
360360
This is free software: see the source for copying information.

tests/testrun.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh -x
22

3-
OS_ARCH=`uname -o`
3+
OS_ARCH=`uname -o 2>/dev/null || echo ""`
44
OS_KERNEL=`uname -s`
55

66
#

0 commit comments

Comments
 (0)