diff options
| author | Michael Vetter <jubalh@iodoru.org> | 2021-07-01 18:26:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 18:26:06 +0200 |
| commit | 3a9cffe01380254f292559255e03e7d5ff71dc9a (patch) | |
| tree | 3b8081782b0e036792baeb1de9109cb355bc1163 /src/command/cmd_defs.c | |
| parent | 7a4a78ab06835ee1a0cce4ec045b8774c6b59cd7 (diff) | |
| parent | d01ba7253539e34fc3d1cf953298791219d5c6a6 (diff) | |
| download | profani-tty-3a9cffe01380254f292559255e03e7d5ff71dc9a.tar.gz | |
Merge pull request #1566 from DebXWoody/bugfixing/ox
Bugfixes for OX implementation
Diffstat (limited to 'src/command/cmd_defs.c')
| -rw-r--r-- | src/command/cmd_defs.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index 16efea21..f2fac9cc 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -1724,10 +1724,12 @@ static struct cmd_t command_defs[] = { "/ox char <char>", "/ox sendfile on|off", "/ox announce <file>", - "/ox discover", - "/ox request <jid>") + "/ox discover <jid>", + "/ox request <jid> <keyid>") CMD_DESC( - "OpenPGP (OX) commands to manage keys, and perform PGP encryption during chat sessions. ") + "OpenPGP (OX) commands to manage keys, and perform OpenPGP encryption during chat sessions. " + "Your OpenPGP key needs a user-id with your JID URI (xmpp:local@domain.tld). " + "A key can be generated with \"gpg --quick-gen-key xmpp:local@domain.tld future-default default 3y\".") CMD_ARGS( { "keys", "List all keys known to the system." }, { "contacts", "Show contacts with assigned public keys." }, @@ -1737,7 +1739,7 @@ static struct cmd_t command_defs[] = { { "log redact", "Log PGP encrypted messages, but replace the contents with [redacted]. This is the default." }, { "char <char>", "Set the character to be displayed next to PGP encrypted messages." }, { "announce <file>", "Announce a public key by pushing it on the XMPP Server" }, - { "discover <jid>", "Discover public keys of a jid " }, + { "discover <jid>", "Discover public keys of a jid. The OpenPGP Key IDs will be displayed" }, { "request <jid>", "Request public keys" }, { "sendfile on|off", "Allow /sendfile to send unencrypted files while otherwise using PGP." }) CMD_EXAMPLES( |