aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Wielicki <j.wielicki@sotecware.net>2017-10-04 15:36:08 +0200
committerJonas Wielicki <j.wielicki@sotecware.net>2017-10-04 15:36:08 +0200
commit5172e44892ab1c6a7c044374d7be12a343919d1b (patch)
tree46b75784682849be8036fd66a814c0b84819704b
parentb9a410551eb6e33c829ab7435d258c7e0ed58954 (diff)
parent61c89def7244060300054058a31676f1a669db01 (diff)
Merge branch 'sims-hashes-2' of https://github.com/Flowdalic/xeps-xsf into feature/xep-0385
-rw-r--r--xep-0385.xml21
1 files changed, 13 insertions, 8 deletions
diff --git a/xep-0385.xml b/xep-0385.xml
index a8c357c..03d3e56 100644
--- a/xep-0385.xml
+++ b/xep-0385.xml
@@ -32,6 +32,12 @@ TODO:
<shortname>sims</shortname>
&tobias;
<revision>
+ <version>0.2.0</version>
+ <date>2017-09-21</date>
+ <initials>fs</initials>
+ <remark><p>Use 'urn:xmpp:hashes:2' and 'urn:xmpp:jingle:apps:file-transfer:5'.</p></remark>
+ </revision>
+ <revision>
<version>0.1.0</version>
<date>2017-01-04</date>
<initials>XEP Editor: ssw</initials>
@@ -125,12 +131,12 @@ TODO:
<body>Look at the nice view from the summit.</body>
<reference xmlns='urn:xmpp:reference:0' begin='17' end='20' type='data'>
<media-sharing xmlns='urn:xmpp:sims:1'>
- <file xmlns='urn:xmpp:jingle:apps:file-transfer:4'>
+ <file xmlns='urn:xmpp:jingle:apps:file-transfer:5'>
<media-type>image/jpeg</media>
<name>summit.jpg</name>
<size>3032449</size>
- <hash xmlns='urn:xmpp:hashes:1' algo='sha3-256'>a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a</hash>
- <hash xmlns='urn:xmpp:hashes:1' algo='id-blake2b256'>a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a</hash>
+ <hash xmlns='urn:xmpp:hashes:2' algo='sha3-256'>2XarmwTlNxDAMkvymloX3S5+VbylNrJt/l5QyPa+YoU=</hash>
+ <hash xmlns='urn:xmpp:hashes:2' algo='id-blake2b256'>2AfMGH8O7UNPTvUVAM9aK13mpCY=</hash>
<desc>Photo from the summit.</desc>
<thumbnail xmlns='urn:xmpp:thumbs:1'uri='cid:sha1+ffd7c8d28e9c5e82afea41f97108c6b4@bob.xmpp.org' media-type='image/png' width='128' height='96'/>
</file>
@@ -239,12 +245,12 @@ TODO:
</html>
<reference xmlns='urn:xmpp:reference:0' begin='17' end='20' type='data'>
<media-sharing xmlns='urn:xmpp:sims:1'>
- <file xmlns='urn:xmpp:jingle:apps:file-transfer:4'>
+ <file xmlns='urn:xmpp:jingle:apps:file-transfer:5'>
<media-type>image/jpeg</media>
<name>summit.jpg</name>
<size>3032449</size>
- <hash xmlns='urn:xmpp:hashes:1' algo='sha3-256'>a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a</hash>
- <hash xmlns='urn:xmpp:hashes:1' algo='id-blake2b256'>a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a</hash>
+ <hash xmlns='urn:xmpp:hashes:2' algo='sha3-256'>2XarmwTlNxDAMkvymloX3S5+VbylNrJt/l5QyPa+YoU=</hash>
+ <hash xmlns='urn:xmpp:hashes:2' algo='id-blake2b256'>2AfMGH8O7UNPTvUVAM9aK13mpCY=</hash>
<desc>Photo from the summit.</desc>
<thumbnail xmlns='urn:xmpp:thumbs:1'uri='cid:sha1+ffd7c8d28e9c5e82afea41f97108c6b4@bob.xmpp.org' media-type='image/png' width='128' height='96'/>
</file>
@@ -255,7 +261,6 @@ TODO:
</media-sharing>
</reference>
</message>]]></example>
- <p class='box'>Note: that ni URIs use a Base64URL encoding for the hash value and &xep0300; uses a hexencoding.</p>
<p>This way the client can aquire the content addressable resource mentioned in the img-tag in the XHTML-IM message, and when finished show in in the rendered XHTML-IM message.</p>
</section2>
</section1>
@@ -279,7 +284,7 @@ TODO:
</section2>
</section1>
<section1 topic='Acknowledgements' anchor='ack'>
- <p>Thanks to Kim Alvefur, Emmanuel Gil Peyrot, Kevin Smith, and Nicolas Vérité for their helpful comments.</p>
+ <p>Thanks to Kim Alvefur, Emmanuel Gil Peyrot, Kevin Smith, Nicolas Vérité, and Florian Schmaus for their helpful comments.</p>
</section1>
<section1 topic='IANA Considerations' anchor='iana'>
<p>REQUIRED.</p>