commit 4b3e5ef59a63796b7f1770c53228ce0b17654ce9
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Fri Mar 27 11:24:27 2015 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Fri Mar 27 11:24:27 2015 +0100
tree 1e0dc5330eab21c75c6fc18e47570c58a7ca5765
parent b5410dbd96fd616ee1bd5aa9c305196021618f70

Avoid duplicate #ifdefs in programs/ssl

programs/ssl/dtls_client.c

diff --git a/programs/ssl/dtls_client.c b/programs/ssl/dtls_client.c
index 3529e66..f9bf800 100644
--- a/programs/ssl/dtls_client.c
+++ b/programs/ssl/dtls_client.c
@@ -29,6 +29,7 @@
 #if defined(POLARSSL_PLATFORM_C)
 #include "mbedtls/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
 #endif
@@ -39,7 +40,6 @@
     !defined(POLARSSL_X509_CRT_PARSE_C) || !defined(POLARSSL_RSA_C) ||      \
     !defined(POLARSSL_CERTS_C)
 
-#include <stdio.h>
 int main( int argc, char *argv[] )
 {
     ((void) argc);
@@ -49,13 +49,12 @@
             "POLARSSL_NET_C and/or "
             "POLARSSL_ENTROPY_C and/or POLARSSL_CTR_DRBG_C and/or "
             "POLARSSL_X509_CRT_PARSE_C and/or POLARSSL_RSA_C and/or "
-            "POLARSSL_CERTS_C not defined.\n" );
+            "POLARSSL_CERTS_C and/or POLARSSL_PEM_PARSE_C not defined.\n" );
     return( 0 );
 }
 #else
 
 #include <string.h>
-#include <stdio.h>
 
 #include "mbedtls/net.h"
 #include "mbedtls/debug.h"
@@ -128,14 +127,8 @@
     polarssl_printf( "  . Loading the CA root certificate ..." );
     fflush( stdout );
 
-#if defined(POLARSSL_CERTS_C) && defined(POLARSSL_PEM_PARSE_C)
     ret = x509_crt_parse( &cacert, (const unsigned char *) test_cas_pem,
                           test_cas_pem_len );
-#else
-    ret = 1;
-    polarssl_printf("POLARSSL_CERTS_C or POLARSSL_PEM_PARSE_C not defined.");
-#endif
-
     if( ret < 0 )
     {
         polarssl_printf( " failed\n  !  x509_crt_parse returned -0x%x\n\n", -ret );
@@ -344,4 +337,5 @@
 }
 #endif /* POLARSSL_SSL_CLI_C && POLARSSL_SSL_PROTO_DTLS && POLARSSL_NET_C &&
           POLARSSL_ENTROPY_C && POLARSSL_CTR_DRBG_C &&
-          POLARSSL_X509_CRT_PARSE_C && POLARSSL_RSA_C && POLARSSL_CERTS_C */
+          POLARSSL_X509_CRT_PARSE_C && POLARSSL_RSA_C && POLARSSL_CERTS_C &&
+          POLARSSL_PEM_PARSE_C */