psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

disallow people to expose private data by crypto downgrade

Browse source
This commit is contained in:
psyc://loupsycedyglgamf.onion/~lynX 2016-02-22 06:38:36 +01:00
parent e7a194e703
commit 02d4e80119
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
world/net/user.c
View file

@ -28,6 +28,7 @@ volatile mixed query;
volatile mapping tags;
volatile int showEcho;
volatile mixed beQuiet;
volatile int encrypted = 0;
// my nickspace. used by psyctext(). could be passed as closure, but then
// it wouldn't be available for *any* psyctext call in user objects.
@ -1572,6 +1573,7 @@ logon() {
string evil;
if (tls_query_connection_state(ME) == 1) {
encrypted++;
// evil TLS ciphers are no problem if the connection is being
// tunneled through SSH or Tor, so we shut up in that case.
if (probably_private(ME) < PRIVACY_REASONABLE &&
@ -1583,11 +1585,22 @@ logon() {
unless (beQuiet) w("_status_circuit_encryption_cipher");
}
} else if (!probably_private(ME)) {
w("_warning_missing_circuit_encryption"
# ifdef _warning_missing_circuit_encryption
, _warning_missing_circuit_encryption
if (encrypted) {
// do not allow a person to (be) downgrade(d) from TLS...
// at least not during the lifetime of this object
w("_error_missing_circuit_encryption"
# ifdef _error_missing_circuit_encryption
, _error_missing_circuit_encryption
# endif
);
);
return remove_interactive(ME);
} else {
w("_warning_missing_circuit_encryption"
# ifdef _warning_missing_circuit_encryption
, _warning_missing_circuit_encryption
# endif
);
}
}
#endif
// cannot if (greeting) here this since jabber:iq:auth depends on this