commit 6b0fa4f33b3b95fb752056f37823b6b483575cc2
author Paul Bakker <p.j.bakker@polarssl.org> Mon Jul 20 20:35:41 2009 +0000
committer Paul Bakker <p.j.bakker@polarssl.org> Mon Jul 20 20:35:41 2009 +0000
tree 2737a362ac083b543b30b18a1d38690d88be20c3
parent 635f4b4cf93daebbe19260db2f9c60c45b8d0d5b

 - Added extra regression and coverage tests for ASN parsing of CRL and Key data

tests/suites/test_suite_x509parse.function

diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 587aa9a..b56b893 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -105,7 +105,7 @@
 END_CASE
 
 BEGIN_CASE
-x509parse_key:key_file:password:result
+x509parse_keyfile:key_file:password:result
 {
     rsa_context rsa;
     int res;
@@ -137,8 +137,6 @@
 
     data_len = unhexify( buf, {crt_data} );
 
-    res = x509parse_crt( &crt, buf, data_len );
-
     TEST_ASSERT( x509parse_crt( &crt, buf, data_len ) == ( {result} ) );
     if( ( {result} ) == 0 )
     {
@@ -153,6 +151,57 @@
 END_CASE
 
 BEGIN_CASE
+x509parse_crl:crl_data:result_str:result
+{
+    x509_crl   crl;
+    unsigned char buf[2000];
+    unsigned char output[2000];
+    int data_len, res;
+
+    memset( &crl, 0, sizeof( x509_crl ) );
+    memset( buf, 0, 2000 );
+    memset( output, 0, 2000 );
+
+    data_len = unhexify( buf, {crl_data} );
+
+    TEST_ASSERT( x509parse_crl( &crl, buf, data_len ) == ( {result} ) );
+    if( ( {result} ) == 0 )
+    {
+        res = x509parse_crl_info( (char *) output, 2000, "", &crl );
+        
+        TEST_ASSERT( res != -1 );
+        TEST_ASSERT( res != -2 );
+
+        TEST_ASSERT( strcmp( (char *) output, {result_str} ) == 0 );
+    }
+}
+END_CASE
+
+BEGIN_CASE
+x509parse_key:key_data:result_str:result
+{
+    rsa_context   rsa;
+    unsigned char buf[2000];
+    unsigned char output[2000];
+    int data_len, res;
+
+    memset( &rsa, 0, sizeof( rsa_context ) );
+    memset( buf, 0, 2000 );
+    memset( output, 0, 2000 );
+
+    data_len = unhexify( buf, {key_data} );
+
+    res = x509parse_key( &rsa, buf, data_len, NULL, 0 );
+
+    TEST_ASSERT( x509parse_key( &rsa, buf, data_len, NULL, 0 ) == ( {result} ) );
+    if( ( {result} ) == 0 )
+    {
+        TEST_ASSERT( 1 );
+    }
+}
+END_CASE
+
+BEGIN_CASE
 x509_selftest:
 {
     TEST_ASSERT( x509_self_test( 0 ) == 0 );