commit 732e1a893c0eeb61e95e77fd4a470557f9964bce
author Paul Bakker <p.j.bakker@polarssl.org> Sun Dec 11 16:35:09 2011 +0000
committer Paul Bakker <p.j.bakker@polarssl.org> Sun Dec 11 16:35:09 2011 +0000
tree 2b221ebcbae15a8f4c2197a476c1aa7c65bc24f2
parent b209de59b79d59c6e4bc494f7b54b0b384533aee

 - Merged trunk into 1.1 branch

programs/x509/cert_app.c

diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c
index a041a47..08d1b9a 100644
--- a/programs/x509/cert_app.c
+++ b/programs/x509/cert_app.c
@@ -200,17 +200,25 @@
         printf( "\n  . Loading the certificate(s) ..." );
         fflush( stdout );
 
-        ret = x509parse_crtfile( &crt, opt.filename, opt.permissive );
+        ret = x509parse_crtfile( &crt, opt.filename );
 
-        if( ret != 0 )
+        if( ret < 0 )
         {
             printf( " failed\n  !  x509parse_crt returned %d\n\n", ret );
             x509_free( &crt );
             goto exit;
         }
 
+        if( opt.permissive == 0 && ret > 0 )
+        {
+            printf( " failed\n  !  x509parse_crt failed to parse %d certificates\n\n", ret );
+            x509_free( &crt );
+            goto exit;
+        }
+
         printf( " ok\n" );
 
+    
         /*
          * 1.2 Print the certificate(s)
          */