commit 1a7550ac6777a92bf67d8130c16314533cf0f892
author Paul Bakker <p.j.bakker@polarssl.org> Sun Sep 15 13:01:22 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Sun Sep 15 13:47:30 2013 +0200
tree 01eac3dec1cb120496e1a102ce1f802769b311f0
parent 24c0e848edb023faea2e13fc6eea56f79a660b75

Moved PK key parsing from X509 module to PK module

tests/suites/test_suite_x509write.function

diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function
index 9352c9e..2969527 100644
--- a/tests/suites/test_suite_x509write.function
+++ b/tests/suites/test_suite_x509write.function
@@ -29,7 +29,7 @@
     memset( &rnd_info, 0x2a, sizeof( rnd_pseudo_info ) );
 
     pk_init( &key );
-    TEST_ASSERT( x509parse_keyfile( &key, key_file, NULL ) == 0 );
+    TEST_ASSERT( pk_parse_keyfile( &key, key_file, NULL ) == 0 );
 
     x509write_csr_init( &req );
     x509write_csr_set_md_alg( &req, md_type );
@@ -83,9 +83,9 @@
     pk_init( &subject_key );
     pk_init( &issuer_key );
 
-    TEST_ASSERT( x509parse_keyfile( &subject_key, subject_key_file,
+    TEST_ASSERT( pk_parse_keyfile( &subject_key, subject_key_file,
                                          subject_pwd ) == 0 );
-    TEST_ASSERT( x509parse_keyfile( &issuer_key, issuer_key_file,
+    TEST_ASSERT( pk_parse_keyfile( &issuer_key, issuer_key_file,
                                          issuer_pwd ) == 0 );
     TEST_ASSERT( mpi_read_string( &serial, 10, serial_str ) == 0 );
 
@@ -141,7 +141,7 @@
     memset( check_buf, 0, sizeof( check_buf ) );
 
     pk_init( &key );
-    TEST_ASSERT( x509parse_public_keyfile( &key, key_file ) == 0 );
+    TEST_ASSERT( pk_parse_public_keyfile( &key, key_file ) == 0 );
 
     ret = x509write_pubkey_pem( &key, buf, sizeof( buf ) - 1);
     TEST_ASSERT( ret >= 0 );
@@ -170,7 +170,7 @@
     memset( check_buf, 0, sizeof( check_buf ) );
 
     pk_init( &key );
-    TEST_ASSERT( x509parse_keyfile( &key, key_file, NULL ) == 0 );
+    TEST_ASSERT( pk_parse_keyfile( &key, key_file, NULL ) == 0 );
 
     ret = x509write_key_pem( &key, buf, sizeof( buf ) - 1);
     TEST_ASSERT( ret >= 0 );