From: Andre Noll <maan@systemlinux.org>
Date: Sat, 23 Apr 2011 13:54:59 +0000 (+0200)
Subject: Merge branch 't/crypt_cleanups'
X-Git-Tag: v0.4.7~14
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=32e646780461f96682d1191d31e08e4602ab125e

Merge branch 't/crypt_cleanups'

Conflicts:
	Makefile.in
---

32e646780461f96682d1191d31e08e4602ab125e
diff --cc Makefile.in
index 8b33aaac,d7640b6c..8ecc1b8f
--- a/Makefile.in
+++ b/Makefile.in
@@@ -56,7 -54,7 +56,6 @@@ CPPFLAGS += -Wunused-macro
  CPPFLAGS += -Wbad-function-cast
  CPPFLAGS += -fno-strict-aliasing
  CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
- CPPFLAGS += @SSL_CPPFLAGS@
 -CPPFLAGS += @ncurses_cppflags@
  CPPFLAGS += @arch_cppflags@
  CPPFLAGS += -I/usr/local/include
  CPPFLAGS += -I$(cmdline_dir)
diff --cc NEWS
index c08197f5,23691951..32957386
--- a/NEWS
+++ b/NEWS
@@@ -1,15 -1,6 +1,16 @@@
 ------------------------------------------------
 -0.4.6 (to be announced) "deterministic entropy"
 ------------------------------------------------
 +-------------------------------------------
 +0.4.7 (to be announced) "infinite rollback"
 +-------------------------------------------
 +
 +	- configure: improved options for ogg/vorbis/speex.
 +	- The git version reported by --version always matches HEAD.
 +	- The autogen script detects the number of processors and
 +	  runs a parallel make if possible.
++	- Major cleanup of the crypto API.
 +
 +------------------------------------------
 +0.4.6 (2011-03-31) "deterministic entropy"
 +------------------------------------------
  
  Lots of ogg/vorbis improvements, the new test suite, enhancements
  for para_gui and a fair amount of other bug fixes.
diff --cc client_common.c
index 54bb9433,33ad1954..d3a9ede1
--- a/client_common.c
+++ b/client_common.c
@@@ -23,9 -20,7 +20,8 @@@
  #include "string.h"
  #include "client.cmdline.h"
  #include "client.h"
- #include "hash.h"
  #include "buffer_tree.h"
 +#include "version.h"
  
  /** The size of the receiving buffer. */
  #define CLIENT_BUFSIZE 4000