diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index 649b547d7..1e758b28c 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -239,7 +239,7 @@ struct _ssl_context
     x509_cert *ca_chain;                /*!<  own trusted CA chain    */
     x509_crl *ca_crl;                   /*!<  trusted CA CRLs         */
     x509_cert *peer_cert;               /*!<  peer X.509 cert chain   */
-    char *peer_cn;                      /*!<  expected peer CN        */
+    const char *peer_cn;                /*!<  expected peer CN        */
 
     int endpoint;                       /*!<  0: client, 1: server    */
     int authmode;                       /*!<  verification mode       */
@@ -398,7 +398,7 @@ void ssl_set_ciphers( ssl_context *ssl, int *ciphers );
  * \note           TODO: add two more parameters: depth and crl
  */
 void ssl_set_ca_chain( ssl_context *ssl, x509_cert *ca_chain,
-                       x509_crl *ca_crl, char *peer_cn );
+                       x509_crl *ca_crl, const char *peer_cn );
 
 /**
  * \brief          Set own certificate and private key
diff --git a/library/Makefile b/library/Makefile
index 4ba960cca..205c6a2f0 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -1,820 +1,58 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
-# Default target executed when no arguments are given to make.
-default_target: all
-.PHONY : default_target
+# Also see "include/polarssl/config.h"
 
-#=============================================================================
-# Special targets provided by cmake.
+CFLAGS	= -I../include -D_FILE_OFFSET_BITS=64 -Wall -Wdeclaration-after-statement
+OFLAGS	= -O
 
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
+# MicroBlaze specific options:
+# CFLAGS += -mno-xl-soft-mul -mxl-barrel-shift
 
-# Remove some rules from gmake that .SUFFIXES does not remove.
-SUFFIXES =
+# To compile on Plan9:
+# CFLAGS += -D_BSD_EXTENSION
 
-.SUFFIXES: .hpux_make_needs_suffix_list
+# To compile as a shared library:
+# CFLAGS += -fPIC
 
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
+DLEXT=so
+# OSX shared library extension:
+# DLEXT=dylib
 
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
+OBJS=	aes.o		arc4.o		base64.o	\
+	bignum.o	certs.o		debug.o		\
+	des.o		dhm.o		havege.o	\
+	md2.o		md4.o		md5.o		\
+	net.o		padlock.o	rsa.o		\
+	sha1.o		sha2.o		sha4.o		\
+	ssl_cli.o	ssl_srv.o	ssl_tls.o	\
+	timing.o	x509parse.o	xtea.o		\
+	camellia.o
 
-#=============================================================================
-# Set environment variables for the build.
+.SILENT:
 
-# The shell in which to execute make rules.
-SHELL = /bin/sh
+all: static
 
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
+static: libpolarssl.a
 
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
+shared: libpolarssl.$(DLEXT)
 
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/paul/src/polarssl
+libpolarssl.a: $(OBJS)
+	echo "  AR    $@"
+	ar r $@ $(OBJS)
+	echo "  RL    $@"
+	ranlib $@
 
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/paul/src/polarssl
+libpolarssl.so: libpolarssl.a
+	echo "  LD    $@"
+	$(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS)
 
-#=============================================================================
-# Targets provided globally by CMake.
+libpolarssl.dylib: libpolarssl.a
+	echo "  LD    $@"
+	$(CC) -dynamiclib -o $@ $(OBJS)
 
-# Special rule for the target edit_cache
-edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
-	/usr/bin/cmake -i .
-.PHONY : edit_cache
+.c.o:
+	echo "  CC    $<"
+	$(CC) $(CFLAGS) $(OFLAGS) -c $<
 
-# Special rule for the target edit_cache
-edit_cache/fast: edit_cache
-.PHONY : edit_cache/fast
-
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
-# Special rule for the target test
-test:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
-	/usr/bin/ctest --force-new-ctest-process $(ARGS)
-.PHONY : test
-
-# Special rule for the target test
-test/fast: test
-.PHONY : test/fast
-
-# The main all target
-all: cmake_check_build_system
-	cd /home/paul/src/polarssl && $(CMAKE_COMMAND) -E cmake_progress_start /home/paul/src/polarssl/CMakeFiles /home/paul/src/polarssl/library/CMakeFiles/progress.marks
-	cd /home/paul/src/polarssl && $(MAKE) -f CMakeFiles/Makefile2 library/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/paul/src/polarssl/CMakeFiles 0
-.PHONY : all
-
-# The main clean target
 clean:
-	cd /home/paul/src/polarssl && $(MAKE) -f CMakeFiles/Makefile2 library/clean
-.PHONY : clean
-
-# The main clean target
-clean/fast: clean
-.PHONY : clean/fast
-
-# Prepare targets for installation.
-preinstall: all
-	cd /home/paul/src/polarssl && $(MAKE) -f CMakeFiles/Makefile2 library/preinstall
-.PHONY : preinstall
-
-# Prepare targets for installation.
-preinstall/fast:
-	cd /home/paul/src/polarssl && $(MAKE) -f CMakeFiles/Makefile2 library/preinstall
-.PHONY : preinstall/fast
-
-# clear depends
-depend:
-	cd /home/paul/src/polarssl && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-.PHONY : depend
-
-# Convenience name for target.
-library/CMakeFiles/polarssl.dir/rule:
-	cd /home/paul/src/polarssl && $(MAKE) -f CMakeFiles/Makefile2 library/CMakeFiles/polarssl.dir/rule
-.PHONY : library/CMakeFiles/polarssl.dir/rule
-
-# Convenience name for target.
-polarssl: library/CMakeFiles/polarssl.dir/rule
-.PHONY : polarssl
-
-# fast build rule for target.
-polarssl/fast:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/build
-.PHONY : polarssl/fast
-
-aes.o: aes.c.o
-.PHONY : aes.o
-
-# target to build an object file
-aes.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/aes.c.o
-.PHONY : aes.c.o
-
-aes.i: aes.c.i
-.PHONY : aes.i
-
-# target to preprocess a source file
-aes.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/aes.c.i
-.PHONY : aes.c.i
-
-aes.s: aes.c.s
-.PHONY : aes.s
-
-# target to generate assembly for a file
-aes.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/aes.c.s
-.PHONY : aes.c.s
-
-arc4.o: arc4.c.o
-.PHONY : arc4.o
-
-# target to build an object file
-arc4.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/arc4.c.o
-.PHONY : arc4.c.o
-
-arc4.i: arc4.c.i
-.PHONY : arc4.i
-
-# target to preprocess a source file
-arc4.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/arc4.c.i
-.PHONY : arc4.c.i
-
-arc4.s: arc4.c.s
-.PHONY : arc4.s
-
-# target to generate assembly for a file
-arc4.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/arc4.c.s
-.PHONY : arc4.c.s
-
-base64.o: base64.c.o
-.PHONY : base64.o
-
-# target to build an object file
-base64.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/base64.c.o
-.PHONY : base64.c.o
-
-base64.i: base64.c.i
-.PHONY : base64.i
-
-# target to preprocess a source file
-base64.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/base64.c.i
-.PHONY : base64.c.i
-
-base64.s: base64.c.s
-.PHONY : base64.s
-
-# target to generate assembly for a file
-base64.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/base64.c.s
-.PHONY : base64.c.s
-
-bignum.o: bignum.c.o
-.PHONY : bignum.o
-
-# target to build an object file
-bignum.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/bignum.c.o
-.PHONY : bignum.c.o
-
-bignum.i: bignum.c.i
-.PHONY : bignum.i
-
-# target to preprocess a source file
-bignum.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/bignum.c.i
-.PHONY : bignum.c.i
-
-bignum.s: bignum.c.s
-.PHONY : bignum.s
-
-# target to generate assembly for a file
-bignum.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/bignum.c.s
-.PHONY : bignum.c.s
-
-camellia.o: camellia.c.o
-.PHONY : camellia.o
-
-# target to build an object file
-camellia.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/camellia.c.o
-.PHONY : camellia.c.o
-
-camellia.i: camellia.c.i
-.PHONY : camellia.i
-
-# target to preprocess a source file
-camellia.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/camellia.c.i
-.PHONY : camellia.c.i
-
-camellia.s: camellia.c.s
-.PHONY : camellia.s
-
-# target to generate assembly for a file
-camellia.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/camellia.c.s
-.PHONY : camellia.c.s
-
-certs.o: certs.c.o
-.PHONY : certs.o
-
-# target to build an object file
-certs.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/certs.c.o
-.PHONY : certs.c.o
-
-certs.i: certs.c.i
-.PHONY : certs.i
-
-# target to preprocess a source file
-certs.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/certs.c.i
-.PHONY : certs.c.i
-
-certs.s: certs.c.s
-.PHONY : certs.s
-
-# target to generate assembly for a file
-certs.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/certs.c.s
-.PHONY : certs.c.s
-
-debug.o: debug.c.o
-.PHONY : debug.o
-
-# target to build an object file
-debug.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/debug.c.o
-.PHONY : debug.c.o
-
-debug.i: debug.c.i
-.PHONY : debug.i
-
-# target to preprocess a source file
-debug.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/debug.c.i
-.PHONY : debug.c.i
-
-debug.s: debug.c.s
-.PHONY : debug.s
-
-# target to generate assembly for a file
-debug.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/debug.c.s
-.PHONY : debug.c.s
-
-des.o: des.c.o
-.PHONY : des.o
-
-# target to build an object file
-des.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/des.c.o
-.PHONY : des.c.o
-
-des.i: des.c.i
-.PHONY : des.i
-
-# target to preprocess a source file
-des.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/des.c.i
-.PHONY : des.c.i
-
-des.s: des.c.s
-.PHONY : des.s
-
-# target to generate assembly for a file
-des.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/des.c.s
-.PHONY : des.c.s
-
-dhm.o: dhm.c.o
-.PHONY : dhm.o
-
-# target to build an object file
-dhm.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/dhm.c.o
-.PHONY : dhm.c.o
-
-dhm.i: dhm.c.i
-.PHONY : dhm.i
-
-# target to preprocess a source file
-dhm.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/dhm.c.i
-.PHONY : dhm.c.i
-
-dhm.s: dhm.c.s
-.PHONY : dhm.s
-
-# target to generate assembly for a file
-dhm.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/dhm.c.s
-.PHONY : dhm.c.s
-
-havege.o: havege.c.o
-.PHONY : havege.o
-
-# target to build an object file
-havege.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/havege.c.o
-.PHONY : havege.c.o
-
-havege.i: havege.c.i
-.PHONY : havege.i
-
-# target to preprocess a source file
-havege.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/havege.c.i
-.PHONY : havege.c.i
-
-havege.s: havege.c.s
-.PHONY : havege.s
-
-# target to generate assembly for a file
-havege.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/havege.c.s
-.PHONY : havege.c.s
-
-md2.o: md2.c.o
-.PHONY : md2.o
-
-# target to build an object file
-md2.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/md2.c.o
-.PHONY : md2.c.o
-
-md2.i: md2.c.i
-.PHONY : md2.i
-
-# target to preprocess a source file
-md2.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/md2.c.i
-.PHONY : md2.c.i
-
-md2.s: md2.c.s
-.PHONY : md2.s
-
-# target to generate assembly for a file
-md2.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/md2.c.s
-.PHONY : md2.c.s
-
-md4.o: md4.c.o
-.PHONY : md4.o
-
-# target to build an object file
-md4.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/md4.c.o
-.PHONY : md4.c.o
-
-md4.i: md4.c.i
-.PHONY : md4.i
-
-# target to preprocess a source file
-md4.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/md4.c.i
-.PHONY : md4.c.i
-
-md4.s: md4.c.s
-.PHONY : md4.s
-
-# target to generate assembly for a file
-md4.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/md4.c.s
-.PHONY : md4.c.s
-
-md5.o: md5.c.o
-.PHONY : md5.o
-
-# target to build an object file
-md5.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/md5.c.o
-.PHONY : md5.c.o
-
-md5.i: md5.c.i
-.PHONY : md5.i
-
-# target to preprocess a source file
-md5.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/md5.c.i
-.PHONY : md5.c.i
-
-md5.s: md5.c.s
-.PHONY : md5.s
-
-# target to generate assembly for a file
-md5.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/md5.c.s
-.PHONY : md5.c.s
-
-net.o: net.c.o
-.PHONY : net.o
-
-# target to build an object file
-net.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/net.c.o
-.PHONY : net.c.o
-
-net.i: net.c.i
-.PHONY : net.i
-
-# target to preprocess a source file
-net.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/net.c.i
-.PHONY : net.c.i
-
-net.s: net.c.s
-.PHONY : net.s
-
-# target to generate assembly for a file
-net.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/net.c.s
-.PHONY : net.c.s
-
-padlock.o: padlock.c.o
-.PHONY : padlock.o
-
-# target to build an object file
-padlock.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/padlock.c.o
-.PHONY : padlock.c.o
-
-padlock.i: padlock.c.i
-.PHONY : padlock.i
-
-# target to preprocess a source file
-padlock.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/padlock.c.i
-.PHONY : padlock.c.i
-
-padlock.s: padlock.c.s
-.PHONY : padlock.s
-
-# target to generate assembly for a file
-padlock.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/padlock.c.s
-.PHONY : padlock.c.s
-
-rsa.o: rsa.c.o
-.PHONY : rsa.o
-
-# target to build an object file
-rsa.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/rsa.c.o
-.PHONY : rsa.c.o
-
-rsa.i: rsa.c.i
-.PHONY : rsa.i
-
-# target to preprocess a source file
-rsa.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/rsa.c.i
-.PHONY : rsa.c.i
-
-rsa.s: rsa.c.s
-.PHONY : rsa.s
-
-# target to generate assembly for a file
-rsa.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/rsa.c.s
-.PHONY : rsa.c.s
-
-sha1.o: sha1.c.o
-.PHONY : sha1.o
-
-# target to build an object file
-sha1.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/sha1.c.o
-.PHONY : sha1.c.o
-
-sha1.i: sha1.c.i
-.PHONY : sha1.i
-
-# target to preprocess a source file
-sha1.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/sha1.c.i
-.PHONY : sha1.c.i
-
-sha1.s: sha1.c.s
-.PHONY : sha1.s
-
-# target to generate assembly for a file
-sha1.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/sha1.c.s
-.PHONY : sha1.c.s
-
-sha2.o: sha2.c.o
-.PHONY : sha2.o
-
-# target to build an object file
-sha2.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/sha2.c.o
-.PHONY : sha2.c.o
-
-sha2.i: sha2.c.i
-.PHONY : sha2.i
-
-# target to preprocess a source file
-sha2.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/sha2.c.i
-.PHONY : sha2.c.i
-
-sha2.s: sha2.c.s
-.PHONY : sha2.s
-
-# target to generate assembly for a file
-sha2.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/sha2.c.s
-.PHONY : sha2.c.s
-
-sha4.o: sha4.c.o
-.PHONY : sha4.o
-
-# target to build an object file
-sha4.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/sha4.c.o
-.PHONY : sha4.c.o
-
-sha4.i: sha4.c.i
-.PHONY : sha4.i
-
-# target to preprocess a source file
-sha4.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/sha4.c.i
-.PHONY : sha4.c.i
-
-sha4.s: sha4.c.s
-.PHONY : sha4.s
-
-# target to generate assembly for a file
-sha4.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/sha4.c.s
-.PHONY : sha4.c.s
-
-ssl_cli.o: ssl_cli.c.o
-.PHONY : ssl_cli.o
-
-# target to build an object file
-ssl_cli.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/ssl_cli.c.o
-.PHONY : ssl_cli.c.o
-
-ssl_cli.i: ssl_cli.c.i
-.PHONY : ssl_cli.i
-
-# target to preprocess a source file
-ssl_cli.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/ssl_cli.c.i
-.PHONY : ssl_cli.c.i
-
-ssl_cli.s: ssl_cli.c.s
-.PHONY : ssl_cli.s
-
-# target to generate assembly for a file
-ssl_cli.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/ssl_cli.c.s
-.PHONY : ssl_cli.c.s
-
-ssl_srv.o: ssl_srv.c.o
-.PHONY : ssl_srv.o
-
-# target to build an object file
-ssl_srv.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/ssl_srv.c.o
-.PHONY : ssl_srv.c.o
-
-ssl_srv.i: ssl_srv.c.i
-.PHONY : ssl_srv.i
-
-# target to preprocess a source file
-ssl_srv.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/ssl_srv.c.i
-.PHONY : ssl_srv.c.i
-
-ssl_srv.s: ssl_srv.c.s
-.PHONY : ssl_srv.s
-
-# target to generate assembly for a file
-ssl_srv.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/ssl_srv.c.s
-.PHONY : ssl_srv.c.s
-
-ssl_tls.o: ssl_tls.c.o
-.PHONY : ssl_tls.o
-
-# target to build an object file
-ssl_tls.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/ssl_tls.c.o
-.PHONY : ssl_tls.c.o
-
-ssl_tls.i: ssl_tls.c.i
-.PHONY : ssl_tls.i
-
-# target to preprocess a source file
-ssl_tls.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/ssl_tls.c.i
-.PHONY : ssl_tls.c.i
-
-ssl_tls.s: ssl_tls.c.s
-.PHONY : ssl_tls.s
-
-# target to generate assembly for a file
-ssl_tls.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/ssl_tls.c.s
-.PHONY : ssl_tls.c.s
-
-timing.o: timing.c.o
-.PHONY : timing.o
-
-# target to build an object file
-timing.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/timing.c.o
-.PHONY : timing.c.o
-
-timing.i: timing.c.i
-.PHONY : timing.i
-
-# target to preprocess a source file
-timing.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/timing.c.i
-.PHONY : timing.c.i
-
-timing.s: timing.c.s
-.PHONY : timing.s
-
-# target to generate assembly for a file
-timing.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/timing.c.s
-.PHONY : timing.c.s
-
-x509parse.o: x509parse.c.o
-.PHONY : x509parse.o
-
-# target to build an object file
-x509parse.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/x509parse.c.o
-.PHONY : x509parse.c.o
-
-x509parse.i: x509parse.c.i
-.PHONY : x509parse.i
-
-# target to preprocess a source file
-x509parse.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/x509parse.c.i
-.PHONY : x509parse.c.i
-
-x509parse.s: x509parse.c.s
-.PHONY : x509parse.s
-
-# target to generate assembly for a file
-x509parse.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/x509parse.c.s
-.PHONY : x509parse.c.s
-
-xtea.o: xtea.c.o
-.PHONY : xtea.o
-
-# target to build an object file
-xtea.c.o:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/xtea.c.o
-.PHONY : xtea.c.o
-
-xtea.i: xtea.c.i
-.PHONY : xtea.i
-
-# target to preprocess a source file
-xtea.c.i:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/xtea.c.i
-.PHONY : xtea.c.i
-
-xtea.s: xtea.c.s
-.PHONY : xtea.s
-
-# target to generate assembly for a file
-xtea.c.s:
-	cd /home/paul/src/polarssl && $(MAKE) -f library/CMakeFiles/polarssl.dir/build.make library/CMakeFiles/polarssl.dir/xtea.c.s
-.PHONY : xtea.c.s
-
-# Help Target
-help:
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... edit_cache"
-	@echo "... polarssl"
-	@echo "... rebuild_cache"
-	@echo "... test"
-	@echo "... aes.o"
-	@echo "... aes.i"
-	@echo "... aes.s"
-	@echo "... arc4.o"
-	@echo "... arc4.i"
-	@echo "... arc4.s"
-	@echo "... base64.o"
-	@echo "... base64.i"
-	@echo "... base64.s"
-	@echo "... bignum.o"
-	@echo "... bignum.i"
-	@echo "... bignum.s"
-	@echo "... camellia.o"
-	@echo "... camellia.i"
-	@echo "... camellia.s"
-	@echo "... certs.o"
-	@echo "... certs.i"
-	@echo "... certs.s"
-	@echo "... debug.o"
-	@echo "... debug.i"
-	@echo "... debug.s"
-	@echo "... des.o"
-	@echo "... des.i"
-	@echo "... des.s"
-	@echo "... dhm.o"
-	@echo "... dhm.i"
-	@echo "... dhm.s"
-	@echo "... havege.o"
-	@echo "... havege.i"
-	@echo "... havege.s"
-	@echo "... md2.o"
-	@echo "... md2.i"
-	@echo "... md2.s"
-	@echo "... md4.o"
-	@echo "... md4.i"
-	@echo "... md4.s"
-	@echo "... md5.o"
-	@echo "... md5.i"
-	@echo "... md5.s"
-	@echo "... net.o"
-	@echo "... net.i"
-	@echo "... net.s"
-	@echo "... padlock.o"
-	@echo "... padlock.i"
-	@echo "... padlock.s"
-	@echo "... rsa.o"
-	@echo "... rsa.i"
-	@echo "... rsa.s"
-	@echo "... sha1.o"
-	@echo "... sha1.i"
-	@echo "... sha1.s"
-	@echo "... sha2.o"
-	@echo "... sha2.i"
-	@echo "... sha2.s"
-	@echo "... sha4.o"
-	@echo "... sha4.i"
-	@echo "... sha4.s"
-	@echo "... ssl_cli.o"
-	@echo "... ssl_cli.i"
-	@echo "... ssl_cli.s"
-	@echo "... ssl_srv.o"
-	@echo "... ssl_srv.i"
-	@echo "... ssl_srv.s"
-	@echo "... ssl_tls.o"
-	@echo "... ssl_tls.i"
-	@echo "... ssl_tls.s"
-	@echo "... timing.o"
-	@echo "... timing.i"
-	@echo "... timing.s"
-	@echo "... x509parse.o"
-	@echo "... x509parse.i"
-	@echo "... x509parse.s"
-	@echo "... xtea.o"
-	@echo "... xtea.i"
-	@echo "... xtea.s"
-.PHONY : help
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	cd /home/paul/src/polarssl && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-.PHONY : cmake_check_build_system
+	rm -f *.o libpolarssl.*
 
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 7f187e29f..bb68f2e0f 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1703,7 +1703,7 @@ void ssl_set_ciphers( ssl_context *ssl, int *ciphers )
 }
 
 void ssl_set_ca_chain( ssl_context *ssl, x509_cert *ca_chain,
-                       x509_crl *ca_crl, char *peer_cn )
+                       x509_crl *ca_crl, const char *peer_cn )
 {
     ssl->ca_chain   = ca_chain;
     ssl->ca_crl     = ca_crl;