Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 20:34:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65690 commits 75 branches 59 tags 1.2 GiB
Commit graph

3679 commits

Author SHA1 Message Date
Simon Walton
64973aa334 OpenSSL HMAC changes for Android 
Looks like Android uses OpenSSL 1.1.0, which provides
an allocator for its HMAC context.
 2018-03-21 17:06:15 -07:00
Simon Walton
fb16e772ba Move HMACAuth class to networking lib 
Also reverts addition of openssl headers to shared lib.
Commit will require rerunning cmake.
 2018-03-21 15:25:50 -07:00
Simon Walton
eb04f77c3d HMAC Auth - code modifications requested by reviewer 2018-03-21 14:04:34 -07:00
Simon Walton
8ce03d65b7 Only update the connection secret UUID if it changes 
Rekeying the openssl HMAC context occasionally causes
hash generation errors. It is not clear why. The Node
secret never seems to change to check for this before
rekeying. Also other clean-up for PR.
 2018-03-20 18:16:45 -07:00
Simon Walton
2a486a4c14 Bump packet version numbers 2018-03-19 17:48:11 -07:00
Simon Walton
020a6a6585 Take out hash timing code 2018-03-19 15:57:32 -07:00
Simon Walton
da7298b8bd Support only HMAC - take out passing around of secret UUID 
Also other clean-up for production use.
 2018-03-19 15:28:44 -07:00
Simon Walton
af21cac0c2 Fixes for gcc 2018-03-19 12:53:16 -07:00
Simon Walton
db8a1ccb3e Set HMAC key once and reuse OpenSSL context 
Store the HMAC wrapper in Node. Unfortunately requires a
lot of plumbing down to NLPacket. Added a mutex to the
wrapper since suspicious crashes occurred.
Authentication times seem to be comparable to existing MD5.
 2018-03-16 18:03:13 -07:00
Simon Walton
480f76c21a Quick trial of HMAC-MD5 auth + timings 2018-03-16 11:50:03 -07:00
Simon Walton
82b68fce8d Quick attempt at using openssl HMAC in NLPacket 2018-03-15 18:32:48 -07:00
John Conklin II
a0e2fc3665
Merge pull request #12564 from SimonWalton-HiFi/record-avatar-pr 
Fixes for missing avatar on record replays
 2018-03-13 14:10:10 -07:00
Brad Hefta-Gaub
6b55fa1fcd
Merge pull request #12539 from ctrlaltdavid/21702 
Remove deprecated Window.location.protocolVersion() function from API
 2018-03-09 08:52:55 -08:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android 
Android Tip
 2018-03-08 10:18:35 -08:00
Clément Brisset
b7ac07f590
Merge pull request #12589 from highfidelity/RC65 
merge back RC65 to master after RC hotfixes
 2018-03-07 17:22:41 -08:00
Simon Walton
17c12fde9c Fix for HandshakeRequest logic 2018-03-06 16:32:04 -08:00
Gabriel Calero
069d3e40bc Merge branch 'android' into android_bubble_fix 2018-03-06 18:58:49 -03:00
Simon Walton
547d86a2d5 Improve debugging diagnostic 2018-03-05 18:10:15 -08:00
Simon Walton
8fb3015ec8 Fix for missing avatar on second replay 
Fixes a logic problem in the handshake request handling; deals with
KillAvatar from the Agent by removing the node-linked data, not
the actual Node; tweaks some of the network debug output.
 2018-03-05 16:51:05 -08:00
Brad Davis
8bfc610cfb Merge remote-tracking branch 'upstream/master' into android 2018-03-05 11:48:58 -08:00
NissimHadar
1eb0dde3d2 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-05 11:36:39 -08:00
Atlante45
85b4c3b422 Protect session UUID from concurrent read/writes 2018-03-02 17:34:18 -08:00
NissimHadar
8536b44c61 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 16:09:06 -08:00
Stephen Birarda
4f151a4237 fix ASCII art for packet headers in NLPacket 2018-03-02 12:41:22 -08:00
NissimHadar
000b08f7c0 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 08:07:01 -08:00
David Rowe
7107e1539f Remove deprecated Window.location.protocolVersion() function from API 2018-03-02 13:45:31 +13:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
John Conklin II
b4000c04bc
Merge pull request #12432 from highfidelity/feat/content-settings 
Add content archives to domain server web interface
 2018-02-27 13:30:53 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
Gabriel Calero
efba05b9a0 Merge branch 'android' into android_bubble_fix 2018-02-27 16:23:51 -03:00
Stephen Birarda
aa7bd2066a Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-26 17:02:00 -08:00
Ryan Huffman
24da043937
Merge pull request #12437 from sethalves/fix-qt-5-10-udt 
fix Qt 5.10 udt packet reading
 2018-02-26 13:50:41 -08:00
Brad Davis
b9387f2a21 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-26 13:18:14 -08:00
Brad Davis
3e552e5739 Fix warnings 2018-02-26 09:53:35 -08:00
Gabriel Calero
7982d8da58 Set bubble default state off for android. 2018-02-26 13:06:22 -03:00
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08:00
Atlante45
c106fee659 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration 2018-02-22 19:45:43 -08:00
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08:00
Stephen Birarda
946474c615 do not init caching for asset requests in domain-server 2018-02-21 16:33:58 -08:00
Nissim Hadar
b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/ShapeEntityItem.h
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2018-02-19 13:05:57 -08:00
Seth Alves
0a92596452 don't rely on return value of pendingDatagramSize() when hasPendingDatagrams() is false 2018-02-18 10:04:22 -08:00
Seth Alves
3027d3461e Qt 5.10 seems to indicate pendingDatagramSizes of 0. Reading from these would block and causes an QAbstractSocket::TemporaryError to be thrown 2018-02-17 15:24:50 -08:00
Brad Davis
458b944d2d Use pikachu for android builds 2018-02-16 09:29:31 -08:00
Atlante45
272f95efa2 Specify wich packet can ignore verification at DS level 2018-02-15 10:09:21 -08:00
Ryan Huffman
cb9327e030 Add entity file sync and domain content backups 2018-02-15 10:09:20 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
Nissim Hadar
054b2bf3e2 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	scripts/system/html/js/entityProperties.js
 2018-02-14 17:10:07 -08:00
Stephen Birarda
6ba2f4b279
Merge pull request #12286 from Atlante45/feat/asset-server-backup 
Add asset server backups capabilities to the Domain Server
 2018-02-13 17:40:11 -07:00