Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,217 Commits 63 Branches 22 Tags 194 MiB
08065b4298
Commit Graph

340 Commits

Author SHA1 Message Date
csoler
08065b4298 ported branch v0.5.0 commits 2623, 2624, 2626, 2633, 2634, 2643, 2644, 2646, 2651 and 2654 to trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-28 20:46:45 +00:00
joss17
e1ea7cda10 update timings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2658 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-28 19:39:23 +00:00
joss17
070af5db2d change the timings and add some randomness for tcp connections 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2657 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-28 19:39:07 +00:00
csoler
f8d6590952 ported v0.5.0 commits 2561,2562 and 2574 to trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-17 15:34:36 +00:00
joss17
0fd8b4d4ee improve the recieving of bad gpg keys 
Conflicts:

	libretroshare/src/services/p3disc.cc

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2555 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-15 19:11:33 +00:00
joss17
a4d1e61aa2 increase udp ttl 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2543 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-14 19:48:43 +00:00
joss17
73615104a7 change ssl binary encryption to aes debug code 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2528 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-12 23:10:01 +00:00
joss17
10205473fc change ssl binary encryption to aes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2527 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-12 23:09:46 +00:00
joss17
43fe49e8b4 lower connection attempt timings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2526 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-12 23:09:32 +00:00
chrisparker126
596940400d Fixed original mistake 
- changed bob's logic by mistake hence configs file were not being written 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2522 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-12 15:37:48 +00:00
csoler
5e0c8e062e bug correction: avoid reading deleted pointers by moving saveDone() after the next line 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2519 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-11 14:14:55 +00:00
joss17
a208efdaf9 fix a bug in the double file configuration loading 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2513 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-10 16:19:28 +00:00
joss17
63c41801c9 error message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2512 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-10 16:19:05 +00:00
chrisparker126
6054890725 Fixed config forward compatibility problem 
- note to self: C++ binary file not same as C binary file 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2510 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-10 14:08:52 +00:00
joss17
da095482db restrain ip list exchange in an attempt for bug solving 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2490 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-06 17:34:04 +00:00
joss17
aa7bed984f small update of connct mgr and ssl connection 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2489 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-05 21:27:42 +00:00
joss17
5ed5e8eb92 small change in ext address detection 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-03 21:09:49 +00:00
chrisparker126
6ab15c8f83 Added new 2-pass save method to configuration management 
- essentially if any part of the file saving procedure fails, there should be config files whose signatures/hash match up

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2476 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-03 18:20:24 +00:00
joss17
235d468ef4 disable the extract failed certificate 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2474 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-02 22:36:27 +00:00
joss17
9fbf62e901 make the gpg key list reading a little more error proof 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2473 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-02 22:35:49 +00:00
joss17
6931a25b45 change the pointer offset cast 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2472 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-02 21:54:30 +00:00
joss17
364a3252f0 Revert "removed c style void* pointer-arithmetic with explicit cast" 
This reverts commit 548b11fc191e258be6ef45544927101596a5a1d8.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-02 21:53:16 +00:00
csoler
1904c05bf9 added initialisation of gpgmeKeySelected. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2467 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-01 20:42:17 +00:00
chrisparker126
6b3ab2996a removed c style void* pointer-arithmetic with explicit cast 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-28 13:28:17 +00:00
joss17
a228503d0e add the tunnel config to server tab, and activate the tunnel on fresh configs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2429 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-25 22:44:27 +00:00
joss17
3d33f5d729 reimplemented the tunnel handshake 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2428 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-25 22:44:04 +00:00
joss17
47b5f62aeb update implemention for new ssl encryption 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2427 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-25 22:43:36 +00:00
joss17
be5957742c remove some exit(1) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2425 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-25 22:43:04 +00:00
joss17
5de1f4db50 implementation of an SSL binary encryption 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2424 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-25 22:42:42 +00:00
csoler
a6c585090a oups. backward commit this change which I done yesterday by mistake 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2420 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-24 21:39:23 +00:00
joss17
80b44220fb Properly close ssl connection when receiving error SYS_CALL. Bug solved 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2410 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-23 22:27:09 +00:00
csoler
5acc8411e5 warning suppression 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2406 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-23 21:55:29 +00:00
drbob
56e9536336 Modified libretroshare to compile under MacOSX. 
1) b64.c used c++ functions -> b64.cc
2) OSX will use miniupnpc for now -> modified #defines.
3) change in openssl fn signature?
4) updated build file for OSX.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2344 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-16 22:25:58 +00:00
joss17
72a3396a58 add a control when establishing a ssl connection and the sockfd is -1 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2331 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-15 15:31:37 +00:00
csoler
17ef6b932b put a safety check against sockfd==-1 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2322 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-14 16:43:42 +00:00
joss17
94aa902a95 clean the qmake files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2318 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-14 14:18:53 +00:00
csoler
7a10cd6c95 added a ending 0 to form a proper string in gpg cert export 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2306 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-13 22:45:25 +00:00
joss17
56694fbc84 change come locks and code cleaning 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2279 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-10 21:54:28 +00:00
csoler
365ef569dc suppressed some uninitialised memory reads 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2267 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-09 20:31:49 +00:00
joss17
fba2a3afae add gpg password static store when gpg password callback is called 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2260 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-09 19:10:15 +00:00
csoler
822d25b294 suppressed printf 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2252 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-09 13:14:47 +00:00
csoler
a84d1e37fc suppressed possible SIGSEGV due to null information in certificate 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2250 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-09 08:37:01 +00:00
joss17
1c51a0faab still further log cleanings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2240 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-08 16:42:26 +00:00
joss17
6f1e4623ab further log cleanings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2239 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-08 14:06:43 +00:00
joss17
5aff139382 further log cleanings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2235 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-07 23:01:46 +00:00
joss17
bf67301d71 remove a maximum of debug outputs for the release 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2232 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-07 21:28:40 +00:00
joss17
d8ae27123e gui cleaning 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-06 20:49:24 +00:00
joss17
c381099e59 set private key trust to full when the validity was unknown 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2204 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-05 21:18:28 +00:00
joss17
6f9b8bb013 solve a bug with gpg private key validity unknown 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2202 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-05 21:00:36 +00:00
joss17
faa1e15db2 fix a bug wich stops multiple connection against the same peer 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2201 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-05 20:39:01 +00:00