@@ -11,6 +11,8 @@ int der_test(void)
11
11
12
12
#else
13
13
14
+ #include <wchar.h>
15
+
14
16
#if defined(LTC_TEST_DBG ) && LTC_TEST_DBG > 2
15
17
#define LTC_DER_TESTS_PRINT_FLEXI
16
18
#endif
@@ -252,7 +254,7 @@ static void s_free(void *p)
252
254
XFREE (p );
253
255
}
254
256
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 )
256
258
{
257
259
char * buf = NULL ;
258
260
const char * name = NULL ;
@@ -435,15 +437,28 @@ static void s_der_tests_print_flexi(ltc_asn1_list* l, unsigned int level)
435
437
}
436
438
437
439
if (ostring ) {
438
- s_der_tests_print_flexi (ostring , level + 1 );
440
+ s_der_tests_print_flexi_i (ostring , level + 1 );
439
441
der_free_sequence_flexi (ostring );
440
442
}
441
443
442
444
if (l -> child )
443
- s_der_tests_print_flexi (l -> child , level + 1 );
445
+ s_der_tests_print_flexi_i (l -> child , level + 1 );
444
446
445
447
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 );
447
462
}
448
463
#endif
449
464
@@ -471,11 +486,7 @@ static void der_cacert_test(void)
471
486
CHECK_ASN1_TYPE (decoded_list , LTC_ASN1_SEQUENCE );
472
487
CHECK_ASN1_HAS_NO_DATA (decoded_list );
473
488
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 );
479
490
480
491
l = decoded_list ;
481
492
@@ -1169,11 +1180,7 @@ static void s_der_decode_print(const void* p, unsigned long* plen)
1169
1180
{
1170
1181
ltc_asn1_list * list ;
1171
1182
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 );
1177
1184
der_sequence_free (list );
1178
1185
}
1179
1186
@@ -1342,11 +1349,7 @@ static void der_Xcode_test(void)
1342
1349
1343
1350
i = sizeof (teletex_neg_int );
1344
1351
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 );
1350
1353
if (list -> child == NULL || list -> child -> next == NULL )
1351
1354
exit (EXIT_FAILURE );
1352
1355
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
1368
1371
{
1369
1372
ltc_asn1_list * * list = ctx ;
1370
1373
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 );
1376
1375
der_sequence_free (* list );
1377
1376
}
1378
1377
return CRYPT_OK ;
0 commit comments