Merge branch 't/crypt_cleanups'

Conflicts:
	Makefile.in

diff --cc Makefile.in
index 8b33aaac0c9fe58bab3b20c61cee25476af90965,d7640b6c3782cfb577b0067230b7b8cc9565021a..8ecc1b8f6d606497aff2e9291e9b962d698cd28e
--- 1/Makefile.in
--- 2/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 c08197f522011aaceb409c542ad1ca6e75a160d0,23691951d23846cf238eafe1878af92fdd722930..3295738632ef423ca4b36f68f3bcdc533d873e38
--- 1/NEWS
--- 2/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 afh.c
Simple merge

diff --cc audioc.c
Simple merge

diff --cc audiod.c
Simple merge

diff --cc client_common.c
index 54bb9433e34cbd0a5bbfed50d07a7d536e0f8b65,33ad19546d2a6e8f5d072152f75e11fefbd6fb18..d3a9ede1f0e1d5b7238a387f0f3aa03650deed55
--- 1/client_common.c
--- 2/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

diff --cc command.c
Simple merge

diff --cc configure.ac
Simple merge

diff --cc error.h
Simple merge

diff --cc fade.c
Simple merge

diff --cc grab_client.c
Simple merge

diff --cc gui.c
Simple merge

diff --cc recv.c
Simple merge

diff --cc server.c
Simple merge

diff --cc write.c
Simple merge