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/error.c

diff --git a/library/error.c b/library/error.c
index fec8152..23f11f2 100644
--- a/library/error.c
+++ b/library/error.c
@@ -117,6 +117,10 @@
 #include "polarssl/pkcs12.h"
 #endif
 
+#if defined(POLARSSL_PKCS5_C)
+#include "polarssl/pkcs5.h"
+#endif
+
 #if defined(POLARSSL_RSA_C)
 #include "polarssl/rsa.h"
 #endif
@@ -566,6 +570,11 @@
         snprintf( buf, buflen, "PBKDF2 - Bad input parameters to function" );
 #endif /* POLARSSL_PBKDF2_C */
 
+#if defined(POLARSSL_PKCS5_C)
+    if( use_ret == -(POLARSSL_ERR_PKCS5_BAD_INPUT_DATA) )
+        snprintf( buf, buflen, "PKCS5 - Bad input parameters to function" );
+#endif /* POLARSSL_PKCS5_C */
+
 #if defined(POLARSSL_SHA1_C)
     if( use_ret == -(POLARSSL_ERR_SHA1_FILE_IO_ERROR) )
         snprintf( buf, buflen, "SHA1 - Read/write error in file" );