[rt-commit] r136 - /redwax-tool/trunk/redwax-tool.c
rt-commit at redwax.eu
rt-commit at redwax.eu
Sat Oct 1 11:51:54 CEST 2022
Author: minfrin at redwax.eu
Date: Sat Oct 1 11:51:43 2022
New Revision: 136
Log:
Fix formatting. Make space for the --der-out option.
Modified:
redwax-tool/trunk/redwax-tool.c
Modified: redwax-tool/trunk/redwax-tool.c
==============================================================================
--- redwax-tool/trunk/redwax-tool.c (original)
+++ redwax-tool/trunk/redwax-tool.c Sat Oct 1 11:51:43 2022
@@ -180,24 +180,25 @@
#define REDWAX_TOOL_LABEL_OUT 286
#define REDWAX_TOOL_NSS_OUT 287
#define REDWAX_TOOL_NSS_SLOT_OUT 288
-#define REDWAX_TOOL_PEM_OUT 289
-#define REDWAX_TOOL_PKCS12_OUT 290
-#define REDWAX_TOOL_PKCS11_OUT 291
-#define REDWAX_TOOL_PKCS11_MODULE_OUT 292
-#define REDWAX_TOOL_METADATA_OUT 293
-#define REDWAX_TOOL_FORMAT_OUT 294
-#define REDWAX_TOOL_JWKS_OUT 295
-#define REDWAX_TOOL_TEXT_OUT 296
-#define REDWAX_TOOL_NO_TEXT_OUT 297
-#define REDWAX_TOOL_SSH_PRIVATE_OUT 298
-#define REDWAX_TOOL_SSH_PUBLIC_OUT 299
-#define REDWAX_TOOL_SMIMEA_OUT 300
-#define REDWAX_TOOL_SSHFP_OUT 301
-#define REDWAX_TOOL_TLSA_OUT 302
-#define REDWAX_TOOL_USER_IN 303
-#define REDWAX_TOOL_USER_OUT 304
-#define REDWAX_TOOL_GROUP_IN 305
-#define REDWAX_TOOL_GROUP_OUT 306
+#define REDWAX_TOOL_DER_OUT 289
+#define REDWAX_TOOL_PEM_OUT 290
+#define REDWAX_TOOL_PKCS12_OUT 291
+#define REDWAX_TOOL_PKCS11_OUT 292
+#define REDWAX_TOOL_PKCS11_MODULE_OUT 293
+#define REDWAX_TOOL_METADATA_OUT 294
+#define REDWAX_TOOL_FORMAT_OUT 295
+#define REDWAX_TOOL_JWKS_OUT 296
+#define REDWAX_TOOL_TEXT_OUT 297
+#define REDWAX_TOOL_NO_TEXT_OUT 298
+#define REDWAX_TOOL_SSH_PRIVATE_OUT 299
+#define REDWAX_TOOL_SSH_PUBLIC_OUT 300
+#define REDWAX_TOOL_SMIMEA_OUT 301
+#define REDWAX_TOOL_SSHFP_OUT 302
+#define REDWAX_TOOL_TLSA_OUT 303
+#define REDWAX_TOOL_USER_IN 304
+#define REDWAX_TOOL_USER_OUT 305
+#define REDWAX_TOOL_GROUP_IN 306
+#define REDWAX_TOOL_GROUP_OUT 307
#define REDWAX_EXIT_OK 0
#define REDWAX_EXIT_INIT 1
@@ -274,6 +275,9 @@
" --no-auto-out\t\t\tOutput everything as specified." },
{ "nss-out", REDWAX_TOOL_NSS_OUT, 1, " --nss-out=directory\t\tWrite certificates, intermediate certificates,\n\t\t\t\troot certificates, crls, and keys to an NSS\n\t\t\t\tdatabase." },
{ "nss-token-out", REDWAX_TOOL_NSS_SLOT_OUT, 1, " --nss-token-out=token\t\tSpecify the token to which certificates, intermediate\n\t\t\t\tcertificates, root certificates, crls, and keys will\n\t\t\t\tbe written to an NSS database. Must appear after the\n\t\t\t\t--nss-out option." },
+#if 0
+ { "der-out", REDWAX_TOOL_DER_OUT, 1, " --der-out=prefix\t\tWrite certificates, intermediate certificates,\n\t\t\t\troot certificates, crls, and keys. Each one is\n\t\t\t\twritten to a file with a suffix indicating type and\n\t\t\t\tindex. Use '-' for stdout, output will be concatenated." },
+#endif
{ "pem-out", REDWAX_TOOL_PEM_OUT, 1, " --pem-out=file\t\tWrite certificates, intermediate certificates,\n\t\t\t\troot certificates, crls, and keys. Use '-'\n\t\t\t\tfor stdout." },
{ "pkcs12-out", REDWAX_TOOL_PKCS12_OUT, 1, " --pkcs12-out=file\t\tWrite certificates, intermediate certificates,\n\t\t\t\troot certificates, crls, and keys into a PKCS12\n\t\t\t\tfile. Use '-' for stdout." },
{ "pkcs11-out", REDWAX_TOOL_PKCS11_OUT, 1, " --pkcs11-out=url\t\tWrite certificates, intermediate certificates,\n\t\t\t\troot certificates, crls, and keys into a PKCS11\n\t\t\t\ttoken identified by the given url." },
@@ -282,8 +286,8 @@
{ "format-out", REDWAX_TOOL_FORMAT_OUT, 1, " --format-out=xml|json|yaml\tFormat of output metadata." },
{ "user-in", REDWAX_TOOL_USER_IN, 1, " --user-in=user\t\tUse the privileges of this user when reading\n\t\t\t\tcertificates and keys." },
{ "user-out", REDWAX_TOOL_USER_OUT, 1, " --user-out=user\t\tUse the privileges of this user when writing\n\t\t\t\tcertificates and keys." },
- { "group-in", REDWAX_TOOL_GROUP_IN, 1, " --group-in=group\t\tUse the privileges of this group when reading\n\t\t\t\tcertificates and keys. If you have set a user\n\t\t\t\tbefore setting a group, you may no longer have permission to set the group. It is recommended that if user and group are set, the group is set first." },
- { "group-out", REDWAX_TOOL_GROUP_OUT, 1, " --group-out=group\t\tUse the privileges of this group when writing\n\t\t\t\tcertificates and keys. If you have set a user\n\t\t\t\tbefore setting a group, you may no longer have permission to set the group. It is recommended that if user and group are set, the group is set first." },
+ { "group-in", REDWAX_TOOL_GROUP_IN, 1, " --group-in=group\t\tUse the privileges of this group when reading\n\t\t\t\tcertificates and keys. If you have set a user\n\t\t\t\tbefore setting a group, you may no longer have\n\t\t\t\tpermission to set the group. It is recommended\n\t\t\t\tthat if user and group are set, the group is set\n\t\t\t\tfirst." },
+ { "group-out", REDWAX_TOOL_GROUP_OUT, 1, " --group-out=group\t\tUse the privileges of this group when writing\n\t\t\t\tcertificates and keys. If you have set a user\n\t\t\t\tbefore setting a group, you may no longer have\n\t\t\t\tpermission to set the group. It is recommended\n\t\t\t\tthat if user and group are set, the group is set\n\t\t\t\tfirst." },
#if 0
{ "jwks-out", REDWAX_TOOL_JWKS_OUT, 1, " --jwks-out=file\t\tWrite keys to the given file as an RFC7517 JSON\n\t\t\t\tWeb Key Set." },
{ "ssh-private-out", REDWAX_TOOL_SSH_PRIVATE_OUT, 1, " --ssh-private-out=file\t\tWrite an SSH private key to the given file." },
@@ -323,7 +327,7 @@
" be read and converted into other formats as needed by common services.\n"
"\n"
" Options are read in order in three phases. All input options are read,\n"
- " then all filter options, and then all output options.\n"
+ " then all filter options, and then all output options.\n"
"\n"
"OPTIONS\n", msg ? msg : "", n, n);
@@ -340,7 +344,7 @@
" - 1: We failed to initialise.\n"
" - 2: The command line options were not valid.\n"
" - 3: No certificates were passed through the filter.\n"
- " - 4: Could not become user or group."
+ " - 4: Could not become user or group.\n"
"\n"
"EXAMPLES\n"
" In this example, we read all PEM files matching the wildcard, we pass\n"
More information about the rt-commit
mailing list