commit b0c19a4b3d965bd89b5ee840eb2c0a4ae12199c6
author Paul Bakker <p.j.bakker@polarssl.org> Mon Jun 24 19:26:38 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Jun 25 15:06:52 2013 +0200
tree cf80b3799176ac4438bc2f8e00cf80ea92f93544
parent fc4f46fa9a04cab01aab75c4c44bf79fe6a5fc26

PKCS#5 module added. Moved PBKDF2 functionality inside and deprecated
old PBKDF2 module.
(cherry picked from commit 19bd297dc896410e0d859729f9e8d4b1e107e6c8)

Conflicts:
	include/polarssl/error.h
	scripts/generate_errors.pl

library/Makefile

diff --git a/library/Makefile b/library/Makefile
index 72f8566..dcc7477 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -47,7 +47,7 @@
 		md4.o		md5.o		net.o			\
 		oid.o									\
 		padlock.o	pbkdf2.o	pem.o			\
-		pkcs11.o	pkcs12.o					\
+		pkcs5.o		pkcs11.o	pkcs12.o		\
 		rsa.o		sha1.o		sha2.o			\
 		sha4.o		ssl_cache.o	ssl_cli.o		\
 		ssl_srv.o   ssl_ciphersuites.o			\