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

tests/CMakeLists.txt

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4d3453d..7c01f39 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -64,6 +64,7 @@
 add_test_suite(mpi)
 add_test_suite(pbkdf2)
 add_test_suite(pkcs1_v21)
+add_test_suite(pkcs5)
 add_test_suite(shax)
 add_test_suite(rsa)
 add_test_suite(version)