commit 4122f3eacfe9f4cc706c0d3b4717838b3a6f67d0
author Paul Bakker <p.j.bakker@polarssl.org> Mon Sep 09 16:01:46 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Mon Sep 09 16:01:46 2013 +0200
tree 7421f4688f733d9bfb69dd53f5e54bae81f96f6f
parent 80d44fee2ef59f3a7ecec4048afcb4fdb3ecd122

Removed POLARSSL_ERROR_C define and added as requirement defing for
cert_req and cert_write apps

programs/x509/cert_req.c

diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c
index 29a0da1..6cc05c8 100644
--- a/programs/x509/cert_req.c
+++ b/programs/x509/cert_req.c
@@ -41,14 +41,16 @@
 #include "polarssl/oid.h"
 
 #if !defined(POLARSSL_BIGNUM_C) || !defined(POLARSSL_RSA_C) ||         \
-    !defined(POLARSSL_X509_PARSE_C) || !defined(POLARSSL_FS_IO)
+    !defined(POLARSSL_X509_PARSE_C) || !defined(POLARSSL_FS_IO) ||     \
+    !defined(POLARSSL_ERROR_C)
 int main( int argc, char *argv[] )
 {
     ((void) argc);
     ((void) argv);
 
     printf("POLARSSL_BIGNUM_C and/or POLARSSL_RSA_C and/or "
-           "POLARSSL_X509_PARSE_C and/or POLARSSL_FS_IO not defined.\n");
+           "POLARSSL_X509_PARSE_C and/or POLARSSL_FS_IO and/or "
+           "POLARSSL_ERROR_C not defined.\n");
     return( 0 );
 }
 #else
@@ -254,9 +256,7 @@
      */
     if( ( ret = x509write_csr_set_subject_name( &req, opt.subject_name ) ) != 0 )
     {
-#ifdef POLARSSL_ERROR_C
         error_strerror( ret, buf, 1024 );
-#endif
         printf( " failed\n  !  x509write_csr_set_subject_name returned %d - %s\n\n", ret, buf );
         goto exit;
     }
@@ -271,9 +271,7 @@
 
     if( ret != 0 )
     {
-#ifdef POLARSSL_ERROR_C
         error_strerror( ret, buf, 1024 );
-#endif
         printf( " failed\n  !  x509parse_key_rsa returned %d - %s\n\n", ret, buf );
         goto exit;
     }
@@ -290,9 +288,7 @@
 
     if( ( ret = write_certificate_request( &req, opt.output_file ) ) != 0 )
     {
-#ifdef POLARSSL_ERROR_C
         error_strerror( ret, buf, 1024 );
-#endif
         printf( " failed\n  !  write_certifcate_request %d - %s\n\n", ret, buf );
         goto exit;
     }