moparisthebest
/
xeps
mirror of https://github.com/moparisthebest/xeps
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge commit 'refs/pull/621/head' of https://github.com/xsf/xeps

This commit is contained in:
Jonas Wielicki 2018-04-26 16:23:50 +02:00
parent 8d29397b0f b0e66eaf86
commit c23e674254
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xep-0373.xml
View File

@ -156,7 +156,7 @@
that is, it represents either a &signcrypt;, a &sign; or a &crypt;
extension element qualified by the 'urn:xmpp:openpgp:0'
namespace. Note that OpenPGP's ASCII Armor is not used, instead
the XMPP client MUST encode the raw bytes of OpenPGP message using
the XMPP client MUST encode the raw bytes of the OpenPGP message using
Base64.</p>
<p>In case of a &signcrypt; element, the OpenPGP message embedded
@ -213,21 +213,21 @@
<td>&signcrypt;</td>
<td>MUST have at least one</td>
<td>MUST have exactly one</td>
<td>SHOULD have exaclty one</td>
<td>SHOULD have exactly one</td>
<td>MUST have exactly one</td>
</tr>
<tr>
<td>&sign;</td>
<td>MAY NOT contain one</td>
<td>MUST have exaclty one</td>
<td>MUST have exactly one</td>
<td>NOT REQUIRED</td>
<td>MUST have exactly one</td>
</tr>
<tr>
<td>&crypt;</td>
<td>MUST have at least one</td>
<td>MUST have exaclty one</td>
<td>SHOULD have exaclty one</td>
<td>MUST have exactly one</td>
<td>SHOULD have exactly one</td>
<td>MUST have exactly one</td>
</tr>
</table>
@ -304,7 +304,7 @@
send a PubSub &IQ; request to the entity's bare JID of which it
wants to know the public key.</p>
<example caption='Requesting a OpenPGP public key from an XMPP entity.'><![CDATA[
<example caption='Requesting an OpenPGP public key from an XMPP entity.'><![CDATA[
<iq from='romeo@example.org/orchard'
to='juliet@example.org'
type='get'
@ -333,7 +333,7 @@
</iq>]]></example>
<p>Note that the result may contain multiple pubkey elements. Only
the public keys found in the most recent MUST be used. Requesters
the public keys found in the most recent item MUST be used. Requesters
may want to limit the results to the most recent item using the
'max_items' attribute set to '1'. Clients could alternatively use
&xep0059; as an alternative to 'max_items' but accoding to

2
xep-0374.xml
View File

@ -128,7 +128,7 @@
<section2 topic='OpenPGP Secured Instant Messaging' anchor='openpgp-secured-im'>
<p>In order to establish a OpenPGP secured IM communication, IM
<p>In order to establish an OpenPGP secured IM communication, IM
clients first need to determine the public key of their
interlocutor(s). OpenPGP historically provides public keyservers
which can be used for key retrieval. Additional there are methods