vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-05 03:35:59 +01:00
Code Issues Releases Wiki Activity
3161 commits 61 branches 35 tags 39 MiB
Commit graph

3161 commits

This branch
This branch
All branches
Author SHA1 Message Date
vanitasvitae
e5edb4cd04
remove unused code 2017-06-10 17:46:57 +02:00
vanitasvitae
830b2deb2e
Fix IBB 2017-06-10 17:16:22 +02:00
vanitasvitae
4728aa4452
Temp 2017-06-10 15:09:30 +02:00
vanitasvitae
38f54b140c
Typo 2017-06-10 01:53:59 +02:00
vanitasvitae
eda7859aa7
S5B session-initiate and -accept 2017-06-10 00:07:27 +02:00
vanitasvitae
a8f172c66b
Rename classes and reuse Socks5Utils class 2017-06-09 23:25:59 +02:00
vanitasvitae
327e63f52d
Fix checkstyle 2017-06-09 23:16:15 +02:00
vanitasvitae
df69c8a81c
Rewrote Jingle code 2017-06-09 21:35:49 +02:00
vanitasvitae
a6b27f62d2
Fix merge errorsF 2017-06-08 23:47:03 +02:00
vanitasvitae
7785f3d38f Merge branch 'HashManagerAdditions' into jingle 2017-06-08 18:31:10 +02:00
vanitasvitae
3b2f970a8d
Add convenience methods to HashManager 2017-06-08 18:00:22 +02:00
vanitasvitae
db294f3f1b
Add functionality to create TransportElements 2017-06-08 17:32:37 +02:00
vanitasvitae
6c0162c341
Reuse S5B-Managers discovery methods 2017-06-08 16:46:39 +02:00
vanitasvitae
135f1ed77b
Add proxy discovery method 2017-06-08 14:59:49 +02:00
vanitasvitae
1775c691af
Create JingleTransportManager framework 2017-06-08 01:59:38 +02:00
vanitasvitae
05b0e3650e
Introduce JingleSocks5TransportInfo class 2017-06-08 00:48:23 +02:00
vanitasvitae
f528e4dd9d Merge branch 'TransportInfo' into jingle 2017-06-07 23:29:03 +02:00
vanitasvitae
9eba23c733
Add JingleContentTransportInfo class 2017-06-07 23:26:38 +02:00
vanitasvitae
bfd3fbdc5b
Progress 2017-06-07 23:18:23 +02:00
vanitasvitae
8240e92c3e
Add S5B providers 2017-06-07 21:08:08 +02:00
vanitasvitae
2686fc1ccb
Proper(er) implementation 2017-06-06 16:51:45 +02:00
vanitasvitae
83cedbe00f Merge remote-tracking branch 'upstream/master' into jingle 2017-06-05 19:07:13 +02:00
Florian Schmaus
acc98b4b2f Merge pull request #137 from vanitasvitae/jingleTests 
Add tests for jingle classes
 2017-06-05 19:06:29 +02:00
vanitasvitae
eb5b51165e Merge remote-tracking branch 'upstream/master' into jingle 2017-06-05 12:38:46 +02:00
Florian Schmaus
349d1ba2ae Merge pull request #136 from vanitasvitae/jingleManagerFixes 
Fix typos and xml issues in jingle package
 2017-06-05 11:04:52 +02:00
vanitasvitae
3a4f758b6a
Fix jingle ft 2017-06-05 00:27:03 +02:00
vanitasvitae
23190604bd
Fix typos and xml issues 2017-06-04 20:41:27 +02:00
vanitasvitae
491db53f89
Send/recv works 2017-06-04 20:33:44 +02:00
vanitasvitae
598c193408
Progress 2017-06-04 17:18:40 +02:00
vanitasvitae
e6d365fb92 Merge branch 'jingleManagerFixes' into jingle 2017-06-04 15:51:07 +02:00
vanitasvitae
37c6961bb0
Fix typos and xml issues 2017-06-04 15:49:06 +02:00
vanitasvitae
4b50e44135 Merge branch 'jingleManagerFixes' into jingle 2017-06-04 13:05:05 +02:00
vanitasvitae
1da1f6a712
Fix typos and xml issues 2017-06-04 13:02:57 +02:00
Florian Schmaus
f7775bf053 Merge pull request #135 from vanitasvitae/securityInfo 
Add missing security-info in JingleAction
 2017-06-04 10:12:20 +02:00
Florian Schmaus
55ae8193b7 Merge pull request #134 from vanitasvitae/hashes 
Add Use of Cryptographic Hashfunctions (XEP-300)
 2017-06-04 10:11:59 +02:00
vanitasvitae
d231024547
Fix errors 2017-06-04 00:06:37 +02:00
vanitasvitae
ff96a7c336 Merge branch 'jingleTests' into jingle 2017-06-03 23:48:05 +02:00
vanitasvitae
0a31161950
Add tests for jingle classes 
Depends on #135, #136
 2017-06-03 23:46:29 +02:00
vanitasvitae
efdf6d7db8
Merge fixes (wip) 2017-06-03 23:38:46 +02:00
vanitasvitae
9e064a9feb Merge branch 'securityInfo' into jingle 2017-06-03 23:32:26 +02:00
vanitasvitae
ea3b1cbccc
Fix typos and xml issues 2017-06-03 23:30:37 +02:00
vanitasvitae
23ed0bdbce
Add missing security-info in JingleAction 
Also fix typo
 2017-06-03 23:23:23 +02:00
vanitasvitae
28f3130cf9
Add Use of Cryptographic Hashfunctions (XEP-300) 
Also move bouncycastle dep from smack-omemo to
smack-experimental.
 2017-06-03 00:33:56 +02:00
vanitasvitae
1bf8cf9a12
Add missing jingle action, some comments 2017-06-02 21:47:20 +02:00
vanitasvitae
9d34cbc6f3 Merge remote-tracking branch 'upstream/master' into jingle 2017-06-02 18:48:02 +02:00
vanitasvitae
df216b2141
More progress 2017-06-02 18:45:11 +02:00
Florian Schmaus
f5ef42ec56 Merge branch '4.2' 2017-06-02 13:51:56 +02:00
vanitasvitae
e86700b040 Add OMEMO support 
This commit adds the modules smack-omemo and smack-omemo-signal.
smack-omemo is licensed under the Apache license like the rest of the smack project.
smack-omemo-signal on the other hand is licensed under the GPLv3.
Due to the fact, that smack-omemo is not of much use without smack-omemo-signal,
the OMEMO feature can currently only be used by GPLv3 compatible software.
This may change in the future, when a more permissively licensed module becomes available.

Fixes SMACK-743.
 2017-06-02 13:40:10 +02:00
Florian Schmaus
ce36fb468c Increase getSocket() timeout in Socks5ClientForInitiatorTest 
This will hopefully reduce the false negatives when running the unit
tests with Travis CI.
 2017-06-02 12:03:46 +02:00
vanitasvitae
cf9dc49bee
Progress. Add Checksum element + provider (wip) 2017-06-01 16:49:58 +02:00