Merge branch 'libradsec' into libradsec-server-support

Conflicts:
	lib/HACKING
	lib/Makefile.am
	lib/README
	lib/compat.h
	lib/conf.c
	lib/configure.ac
	lib/conn.c
	lib/conn.h
	lib/err.c
	lib/err.h
	lib/event.c
	lib/event.h
	lib/examples/Makefile.am
	lib/examples/client-blocking.c
	lib/examples/client.conf
	lib/include/radsec/radsec-impl.h
	lib/include/radsec/radsec.h
	lib/include/radsec/request-impl.h
	lib/include/radsec/request.h
	lib/packet.c
	lib/packet.h
	lib/peer.c
	lib/peer.h
	lib/request.c
	lib/send.c
	lib/tcp.c
	lib/tests/Makefile.am
	lib/tls.c
	lib/udp.c
	lib/util.c

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/md5.c b/lib/md5.c
index 7d43a60..f4ac436 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -89,9 +89,9 @@
  * This processes one or more 64-byte data blocks, but does NOT update
  * the bit counters.  There are no alignment requirements.
  */
-static void *body(MD5_CTX *ctx, void *data, unsigned long size)
+static const void *body(MD5_CTX *ctx, const void *data, unsigned long size)
 {
-	unsigned char *ptr;
+	const unsigned char *ptr;
 	MD5_u32plus a, b, c, d;
 	MD5_u32plus saved_a, saved_b, saved_c, saved_d;
 
@@ -207,7 +207,7 @@ void MD5_Init(MD5_CTX *ctx)
 	ctx->hi = 0;
 }
 
-void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
+void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size)
 {
 	MD5_u32plus saved_lo;
 	unsigned long used, free;