commit 19bd297dc896410e0d859729f9e8d4b1e107e6c8
author Paul Bakker <p.j.bakker@polarssl.org> Fri Jun 14 12:06:45 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Fri Jun 14 12:06:45 2013 +0200
tree 15527ed66b206345220bfd6e03f3608f8aac0928
parent 52b845be34a6b5cfa48f34bfbcddd83069d8c0c3

PKCS#5 module added. Moved PBKDF2 functionality inside and deprecated
old PBKDF2 module.

library/error.c

diff --git a/library/error.c b/library/error.c
index 48f8e49..17b414a 100644
--- a/library/error.c
+++ b/library/error.c
@@ -109,6 +109,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
@@ -544,6 +548,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" );