commit f38e71afd516ca5e3def416015ec73d18c18b746
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu Sep 12 05:21:54 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Thu Sep 12 11:57:02 2013 +0200
tree e8437bc733afd5ce5dbea9a471a3e829ea8677af
parent 6de63e480d77857c271f56d72d8d53ad43ac4837

Convert x509write_crt interface to PK

tests/suites/test_suite_x509write.function

diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function
index c2d4e4e..f916b1c 100644
--- a/tests/suites/test_suite_x509write.function
+++ b/tests/suites/test_suite_x509write.function
@@ -66,7 +66,7 @@
                      char *serial_str, char *not_before, char *not_after,
                      int md_type, char *cert_check_file )
 {
-    rsa_context subject_rsa, issuer_rsa;
+    pk_context subject_key, issuer_key;
     pem_context pem;
     x509write_cert crt;
     unsigned char *c;
@@ -78,12 +78,12 @@
     FILE *f;
 
     mpi_init( &serial );
-    rsa_init( &subject_rsa, RSA_PKCS_V15, 0 );
-    rsa_init( &issuer_rsa, RSA_PKCS_V15, 0 );
+    pk_init( &subject_key );
+    pk_init( &issuer_key );
 
-    TEST_ASSERT( x509parse_keyfile_rsa( &subject_rsa, subject_key_file,
+    TEST_ASSERT( x509parse_keyfile( &subject_key, subject_key_file,
                                          subject_pwd ) == 0 );
-    TEST_ASSERT( x509parse_keyfile_rsa( &issuer_rsa, issuer_key_file,
+    TEST_ASSERT( x509parse_keyfile( &issuer_key, issuer_key_file,
                                          issuer_pwd ) == 0 );
     TEST_ASSERT( mpi_read_string( &serial, 10, serial_str ) == 0 );
 
@@ -94,8 +94,8 @@
     x509write_crt_set_md_alg( &crt, md_type );
     TEST_ASSERT( x509write_crt_set_issuer_name( &crt, issuer_name ) == 0 );
     TEST_ASSERT( x509write_crt_set_subject_name( &crt, subject_name ) == 0 );
-    x509write_crt_set_subject_key( &crt, &subject_rsa );
-    x509write_crt_set_issuer_key( &crt, &issuer_rsa );
+    x509write_crt_set_subject_key( &crt, &subject_key );
+    x509write_crt_set_issuer_key( &crt, &issuer_key );
 
     TEST_ASSERT( x509write_crt_set_basic_constraints( &crt, 0, 0 ) == 0 );
     TEST_ASSERT( x509write_crt_set_subject_key_identifier( &crt ) == 0 );
@@ -118,8 +118,8 @@
     TEST_ASSERT( memcmp( c, pem.buf, pem.buflen ) == 0 );
 
     x509write_crt_free( &crt );
-    rsa_free( &issuer_rsa );
-    rsa_free( &subject_rsa );
+    pk_free( &issuer_key );
+    pk_free( &subject_key );
     pem_free( &pem );
     mpi_free( &serial );
 }