devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request #1566 from DebXWoody/bugfixing/ox

Browse Source 
Bugfixes for OX implementation
This commit is contained in:
Michael Vetter
2021-07-01 18:26:06 +02:00
committed by GitHub
parent 7a4a78ab06 d01ba72535
commit 3a9cffe013
6 changed files with 88 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/command/cmd_defs.c
View File

@@ -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(