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

include/polarssl/error.h

diff --git a/include/polarssl/error.h b/include/polarssl/error.h
index 9a3de00..4e5f69e 100644
--- a/include/polarssl/error.h
+++ b/include/polarssl/error.h
@@ -72,6 +72,7 @@
  * SHA4      1  0x007A-0x007A
  * PBKDF2    1  0x007C-0x007C
  * ECP       1  0x007E-0x007E
+ * PKCS5     1  0x007C-0x007C
  *
  * High-level module nr (3 bits - 0x1...-0x8...)
  * Name     ID  Nr of Errors