]> git.tue.mpg.de Git - paraslash.git/commitdiff
Merge branch 't/aes'
authorAndre Noll <maan@systemlinux.org>
Sun, 16 Mar 2014 16:49:59 +0000 (17:49 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 16 Mar 2014 16:55:17 +0000 (17:55 +0100)
Cooking since 2014-02-02.

* t/aes:
  Implement aes_ctr128 and prefer it over RC4.
  server: Lookup user only once.

1  2 
NEWS
client_common.c
command.c
web/manual.m4

diff --cc NEWS
index b535dd6b7df182b3a9de88817b19701882c45c19,51d9db7c1e1b8b1b9c3ba201f464b29ebd25bcf4..84a420584242f6a7e2f6a1b2306c4c0000fb8065
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,16 -1,6 +1,25 @@@
  NEWS
  ====
  
 +---------------------------------------------
 +0.5.2 (to be announced) "orthogonal interior"
 +---------------------------------------------
 +
++The new sync filter, the AES_CTR128 stream cipher and the overhauled
++network code are the highlights of this release.
++
 +      - The new sync filter synchronizes playback between multiple
 +        clients.
++      - Connections between para_server and para_client are now
++        encrypted by means of AES rather than RC4 if both sides
++        support it. RC4 is still available as a fallback. This
++        feature is fully transparent, i.e. no command line options
++        are necessary, and a client linked against openssl can
++        speak with a server linked against libgcrypt and vice versa.
 +      - Major cleanup of the networking subsystem.
 +      - Improved user manual.
 +      - Minor fixes to avoid clang warnings.
 +
  ------------------------------------------
  0.5.1 (2013-12-20) "temporary implication"
  ------------------------------------------
diff --cc client_common.c
Simple merge
diff --cc command.c
Simple merge
diff --cc web/manual.m4
Simple merge