@@ -11,6 +11,8 @@ int der_test(void)
1111
1212#else
1313
14+ #include <wchar.h>
15+
1416#if defined(LTC_TEST_DBG ) && LTC_TEST_DBG > 2
1517#define LTC_DER_TESTS_PRINT_FLEXI
1618#endif
@@ -252,7 +254,7 @@ static void s_free(void *p)
252254 XFREE (p );
253255}
254256
255- static void s_der_tests_print_flexi (ltc_asn1_list * l , unsigned int level )
257+ static void s_der_tests_print_flexi_i (ltc_asn1_list * l , unsigned int level )
256258{
257259 char * buf = NULL ;
258260 const char * name = NULL ;
@@ -435,15 +437,28 @@ static void s_der_tests_print_flexi(ltc_asn1_list* l, unsigned int level)
435437 }
436438
437439 if (ostring ) {
438- s_der_tests_print_flexi (ostring , level + 1 );
440+ s_der_tests_print_flexi_i (ostring , level + 1 );
439441 der_free_sequence_flexi (ostring );
440442 }
441443
442444 if (l -> child )
443- s_der_tests_print_flexi (l -> child , level + 1 );
445+ s_der_tests_print_flexi_i (l -> child , level + 1 );
444446
445447 if (l -> next )
446- s_der_tests_print_flexi (l -> next , level );
448+ s_der_tests_print_flexi_i (l -> next , level );
449+ }
450+
451+ static void s_der_tests_print_flexi (ltc_asn1_list * l )
452+ {
453+ fprintf (stderr , "\n\n" );
454+ s_der_tests_print_flexi_i (l , 0 );
455+ fprintf (stderr , "\n\n" );
456+ }
457+
458+ #else
459+ static void s_der_tests_print_flexi (ltc_asn1_list * l )
460+ {
461+ LTC_UNUSED_PARAM (l );
447462}
448463#endif
449464
@@ -471,11 +486,7 @@ static void der_cacert_test(void)
471486 CHECK_ASN1_TYPE (decoded_list , LTC_ASN1_SEQUENCE );
472487 CHECK_ASN1_HAS_NO_DATA (decoded_list );
473488
474- #ifdef LTC_DER_TESTS_PRINT_FLEXI
475- printf ("\n\n--- test print start ---\n\n" );
476- s_der_tests_print_flexi (decoded_list , 0 );
477- printf ("\n\n--- test print end ---\n\n" );
478- #endif
489+ s_der_tests_print_flexi (decoded_list );
479490
480491 l = decoded_list ;
481492
@@ -1169,11 +1180,7 @@ static void s_der_decode_print(const void* p, unsigned long* plen)
11691180{
11701181 ltc_asn1_list * list ;
11711182 DO (der_decode_sequence_flexi (p , plen , & list ));
1172- #ifdef LTC_DER_TESTS_PRINT_FLEXI
1173- fprintf (stderr , "\n\n" );
1174- s_der_tests_print_flexi (list , 0 );
1175- fprintf (stderr , "\n\n" );
1176- #endif
1183+ s_der_tests_print_flexi (list );
11771184 der_sequence_free (list );
11781185}
11791186
@@ -1342,11 +1349,7 @@ static void der_Xcode_test(void)
13421349
13431350 i = sizeof (teletex_neg_int );
13441351 DO (der_decode_sequence_flexi (teletex_neg_int , & i , & list ));
1345- #ifdef LTC_DER_TESTS_PRINT_FLEXI
1346- fprintf (stderr , "\n\n" );
1347- s_der_tests_print_flexi (list , 0 );
1348- fprintf (stderr , "\n\n" );
1349- #endif
1352+ s_der_tests_print_flexi (list );
13501353 if (list -> child == NULL || list -> child -> next == NULL )
13511354 exit (EXIT_FAILURE );
13521355 ttex_neg_int [0 ] = * list -> child -> next ;
@@ -1368,11 +1371,7 @@ static int s_der_decode_sequence_flexi(const void *in, unsigned long inlen, void
13681371{
13691372 ltc_asn1_list * * list = ctx ;
13701373 if (der_decode_sequence_flexi (in , & inlen , list ) == CRYPT_OK ) {
1371- #ifdef LTC_DER_TESTS_PRINT_FLEXI
1372- fprintf (stderr , "\n\n" );
1373- s_der_tests_print_flexi (* list , 0 );
1374- fprintf (stderr , "\n\n" );
1375- #endif
1374+ s_der_tests_print_flexi (* list );
13761375 der_sequence_free (* list );
13771376 }
13781377 return CRYPT_OK ;
0 commit comments