commit 7cfbaf05b3f36debb949956168c4d4e6b589a6a3
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Fri Apr 24 14:10:04 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Fri Apr 24 14:10:04 2015 +0200
tree 90125234f50eeaf7243b9b83260e476873cfd532
parent 331ba5778a21c8295d4350bdd05b32ffb567e8a2
parent 9ce1bdc1519d1b0571383064a79bc55f9adc4b8f

Merge branch 'mbedtls-1.3' into development

* mbedtls-1.3:
  Fix bugs in programs displaying verify flags

Conflicts:
	programs/test/ssl_cert_test.c
	programs/x509/cert_app.c

programs/test/ssl_cert_test.c

diff --git a/programs/test/ssl_cert_test.c b/programs/test/ssl_cert_test.c
index f33d9a3..d699c80 100644
--- a/programs/test/ssl_cert_test.c
+++ b/programs/test/ssl_cert_test.c
@@ -181,7 +181,7 @@
              }
              else
              {
-                mbedtls_printf( " failed\n  !  mbedtls_x509_crt_verify returned %d\n\n", ret );
+                mbedtls_printf( " failed\n  !  mbedtls_x509_crt_verify returned %d\n\n", flags );
                 goto exit;
             }
         }

programs/x509/cert_app.c

diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c
index 2593b5e..04fd325 100644
--- a/programs/x509/cert_app.c
+++ b/programs/x509/cert_app.c
@@ -346,7 +346,7 @@
 
                 mbedtls_printf( " failed\n" );
 
-                mbedtls_x509_crt_verify_info( vrfy_buf, sizeof( vrfy_buf ), "  ! ", ret );
+                mbedtls_x509_crt_verify_info( vrfy_buf, sizeof( vrfy_buf ), "  ! ", flags );
 
                 mbedtls_printf( "%s\n", vrfy_buf );
             }