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
diff --git a/tests/suites/test_suite_pkcs5.data b/tests/suites/test_suite_pkcs5.data
new file mode 100644
index 0000000..1ac2be7
--- /dev/null
+++ b/tests/suites/test_suite_pkcs5.data
@@ -0,0 +1,14 @@
+PBKDF2 RFC 6070 Test Vector #1 (SHA1)
+pbkdf2_hmac:POLARSSL_MD_SHA1:"70617373776f7264":"73616c74":1:20:"0c60c80f961f0e71f3a9b524af6012062fe037a6"
+
+PBKDF2 RFC 6070 Test Vector #2 (SHA1)
+pbkdf2_hmac:POLARSSL_MD_SHA1:"70617373776f7264":"73616c74":2:20:"ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957"
+
+PBKDF2 RFC 6070 Test Vector #3 (SHA1)
+pbkdf2_hmac:POLARSSL_MD_SHA1:"70617373776f7264":"73616c74":4096:20:"4b007901b765489abead49d926f721d065a429c1"
+
+PBKDF2 RFC 6070 Test Vector #5 (SHA1)
+pbkdf2_hmac:POLARSSL_MD_SHA1:"70617373776f726450415353574f524470617373776f7264":"73616c7453414c5473616c7453414c5473616c7453414c5473616c7453414c5473616c74":4096:25:"3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038"
+
+PBKDF2 RFC 6070 Test Vector #6 (SHA1)
+pbkdf2_hmac:POLARSSL_MD_SHA1:"7061737300776f7264":"7361006c74":4096:16:"56fa6aa75548099dcc37d7f03425e0c3"
diff --git a/tests/suites/test_suite_pkcs5.function b/tests/suites/test_suite_pkcs5.function
new file mode 100644
index 0000000..2874c08
--- /dev/null
+++ b/tests/suites/test_suite_pkcs5.function
@@ -0,0 +1,39 @@
+BEGIN_HEADER
+#include <polarssl/pkcs5.h>
+END_HEADER
+
+BEGIN_DEPENDENCIES
+depends_on:POLARSSL_PKCS5_C
+END_DEPENDENCIES
+
+BEGIN_CASE
+pbkdf2_hmac:hash:hex_password_string:hex_salt_string:it_cnt:key_len:result_key_string
+{
+ unsigned char pw_str[100];
+ unsigned char salt_str[100];
+ unsigned char dst_str[100];
+
+ md_context_t ctx;
+ const md_info_t *info;
+
+ int pw_len, salt_len;
+ unsigned char key[100];
+
+ memset(pw_str, 0x00, 100);
+ memset(salt_str, 0x00, 100);
+ memset(dst_str, 0x00, 100);
+
+ pw_len = unhexify( pw_str, {hex_password_string} );
+ salt_len = unhexify( salt_str, {hex_salt_string} );
+
+
+ info = md_info_from_type( {hash} );
+ TEST_ASSERT( info != NULL );
+ TEST_ASSERT( md_init_ctx( &ctx, info ) == 0 );
+ TEST_ASSERT( pkcs5_pbkdf2_hmac( &ctx, pw_str, pw_len, salt_str, salt_len,
+ {it_cnt}, {key_len}, key ) == 0 );
+
+ hexify( dst_str, key, {key_len} );
+ TEST_ASSERT( strcmp( (char *) dst_str, {result_key_string} ) == 0 );
+}
+END_CASE