diff options
Diffstat (limited to 'tests')
53 files changed, 260 insertions, 199 deletions
diff --git a/tests/anonself.c b/tests/anonself.c index c75c0ee67e..40ef7bc4e5 100644 --- a/tests/anonself.c +++ b/tests/anonself.c @@ -24,7 +24,7 @@ /* Parts copied from GnuTLS example programs. */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/certder.c b/tests/certder.c index 5f931d3fa5..fc3991b690 100644 --- a/tests/certder.c +++ b/tests/certder.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include <gnutls/gnutls.h> diff --git a/tests/certificate_set_x509_crl.c b/tests/certificate_set_x509_crl.c index 07b0314375..b242ccd0f1 100644 --- a/tests/certificate_set_x509_crl.c +++ b/tests/certificate_set_x509_crl.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/certuniqueid.c b/tests/certuniqueid.c index 7a6104fb4f..96a363e51b 100644 --- a/tests/certuniqueid.c +++ b/tests/certuniqueid.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include "gnutls/gnutls.h" @@ -35,63 +35,114 @@ doit (void) { int ret; unsigned char der[] = { -0x30, 0x82, 0x03, 0x00, 0x30, 0x82, 0x01, 0xec, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x10, 0xbd, -0x76, 0xdf, 0x42, 0x47, 0x0a, 0x00, 0x8d, 0x47, 0x3e, 0x74, 0x3f, 0xa1, 0xdc, 0x8b, 0xbd, 0x30, -0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1d, 0x05, 0x00, 0x30, 0x2d, 0x31, 0x2b, 0x30, 0x29, -0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x22, 0x77, 0x00, 0x32, 0x00, 0x6b, 0x00, 0x38, 0x00, 0x72, -0x00, 0x32, 0x00, 0x2e, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x74, 0x00, 0x77, 0x00, 0x73, 0x00, 0x2e, -0x00, 0x6e, 0x00, 0x65, 0x00, 0x74, 0x00, 0x00, 0x00, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x30, 0x30, -0x34, 0x32, 0x38, 0x31, 0x31, 0x34, 0x31, 0x35, 0x34, 0x5a, 0x17, 0x0d, 0x31, 0x31, 0x30, 0x34, -0x32, 0x38, 0x31, 0x31, 0x34, 0x31, 0x35, 0x34, 0x5a, 0x30, 0x2d, 0x31, 0x2b, 0x30, 0x29, 0x06, -0x03, 0x55, 0x04, 0x03, 0x13, 0x22, 0x77, 0x00, 0x32, 0x00, 0x6b, 0x00, 0x38, 0x00, 0x72, 0x00, -0x32, 0x00, 0x2e, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x74, 0x00, 0x77, 0x00, 0x73, 0x00, 0x2e, 0x00, -0x6e, 0x00, 0x65, 0x00, 0x74, 0x00, 0x00, 0x00, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, -0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, -0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xaa, 0xd7, 0x32, 0x26, 0xd7, 0xfc, 0x69, -0x57, 0x4a, 0x55, 0x08, 0x2b, 0x97, 0xc1, 0x5b, 0x90, 0xfd, 0xe8, 0xf5, 0xf7, 0x9e, 0x7d, 0x34, -0xce, 0xe9, 0xbb, 0x38, 0xa0, 0x9f, 0xec, 0x84, 0x86, 0x3e, 0x47, 0x2e, 0x71, 0xd7, 0xc3, 0xbf, -0x89, 0xf3, 0x80, 0xb5, 0x77, 0x80, 0xd3, 0xb0, 0x56, 0x6b, 0x9c, 0xf4, 0xd3, 0x42, 0x2b, 0x26, -0x01, 0x5c, 0x42, 0xef, 0xf6, 0x51, 0x5a, 0xaa, 0x55, 0x6b, 0x30, 0xd3, 0x2c, 0xdc, 0xde, 0x36, -0x4d, 0xdd, 0xf3, 0x5f, 0x59, 0xba, 0x57, 0xd8, 0x39, 0x0f, 0x5b, 0xd3, 0xe1, 0x34, 0x39, 0x22, -0xaa, 0x71, 0x10, 0x59, 0x7a, 0xec, 0x9f, 0x1a, 0xf5, 0xa9, 0x40, 0xd6, 0x7b, 0x32, 0x5f, 0x19, -0x85, 0xc0, 0xfd, 0xa6, 0x6c, 0x32, 0x58, 0xdc, 0x7c, 0x07, 0x42, 0x36, 0xd0, 0x57, 0x78, 0x63, -0x60, 0x92, 0x1d, 0x1f, 0x9d, 0xbd, 0xcc, 0xd7, 0xe3, 0x1a, 0x57, 0xdb, 0x70, 0x80, 0x89, 0x36, -0x39, 0x01, 0x71, 0x5a, 0x2a, 0x05, 0x25, 0x13, 0x80, 0xf8, 0x49, 0x48, 0x5f, 0x06, 0xd0, 0xcb, -0x2c, 0x58, 0x9a, 0xe7, 0x8b, 0x6d, 0x17, 0x2c, 0xb2, 0x97, 0x2c, 0x15, 0xc9, 0x73, 0x6d, 0x8f, -0x4f, 0xf3, 0xf1, 0xb9, 0x70, 0x3f, 0xcb, 0x5f, 0x80, 0x85, 0x8b, 0xdf, 0xd2, 0x05, 0x95, 0x1c, -0xe4, 0x37, 0xee, 0xd2, 0x62, 0x49, 0x08, 0xdf, 0xf6, 0x02, 0xec, 0xe6, 0x9a, 0x37, 0xfc, 0x21, -0x7a, 0x98, 0x12, 0x1d, 0x79, 0xbf, 0xc7, 0x0f, 0x0a, 0x20, 0xf8, 0xef, 0xa5, 0xc6, 0x0e, 0x94, -0x5e, 0x17, 0x94, 0x12, 0x42, 0xfe, 0xd7, 0x22, 0xbd, 0x31, 0x27, 0xc7, 0xdb, 0x4a, 0x4e, 0x95, -0xe2, 0xc1, 0xdd, 0xe8, 0x0f, 0x7d, 0x1d, 0xe4, 0xfd, 0xb1, 0x27, 0x7b, 0xc1, 0x71, 0xfe, 0x27, -0x47, 0x89, 0xf4, 0xfc, 0x84, 0xa5, 0x57, 0x5d, 0x21, 0x02, 0x03, 0x01, 0x00, 0x01, 0x81, 0x11, -0x00, 0xbd, 0x8b, 0xdc, 0xa1, 0x3f, 0x74, 0x3e, 0x47, 0x8d, 0x00, 0x0a, 0x47, 0x42, 0xdf, 0x76, -0xbd, 0x82, 0x11, 0x00, 0xbd, 0x8b, 0xdc, 0xa1, 0x3f, 0x74, 0x3e, 0x47, 0x8d, 0x00, 0x0a, 0x47, -0x42, 0xdf, 0x76, 0xbd, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1d, 0x05, 0x00, 0x03, -0x82, 0x01, 0x01, 0x00, 0xa7, 0xb0, 0x66, 0x75, 0x14, 0x7e, 0x7d, 0xb5, 0x31, 0xec, 0xb2, 0xeb, -0x90, 0x80, 0x95, 0x25, 0x59, 0x0f, 0xe4, 0x15, 0x86, 0x2d, 0x9d, 0xd7, 0x35, 0xe9, 0x22, 0x74, -0xe7, 0x85, 0x36, 0x19, 0x4f, 0x27, 0x5c, 0x17, 0x63, 0x7b, 0x2a, 0xfe, 0x59, 0xe9, 0x76, 0x77, -0xd0, 0xc9, 0x40, 0x78, 0x7c, 0x31, 0x62, 0x1e, 0x87, 0x1b, 0xc1, 0x19, 0xef, 0x6f, 0x15, 0xe6, -0xce, 0x74, 0x84, 0x6d, 0xd6, 0x3b, 0x57, 0xd9, 0xa9, 0x13, 0xf6, 0x7d, 0x84, 0xe7, 0x8f, 0xc6, -0x01, 0x5f, 0xcf, 0xc4, 0x95, 0xc9, 0xde, 0x97, 0x17, 0x43, 0x12, 0x70, 0x27, 0xf9, 0xc4, 0xd7, -0xe1, 0x05, 0xbb, 0x63, 0x87, 0x5f, 0xdc, 0x20, 0xbd, 0xd1, 0xde, 0xd6, 0x2d, 0x9f, 0x3f, 0x5d, -0x0a, 0x27, 0x40, 0x11, 0x5f, 0x5d, 0x54, 0xa7, 0x28, 0xf9, 0x03, 0x2e, 0x84, 0x8d, 0x48, 0x60, -0xa1, 0x71, 0xa3, 0x46, 0x69, 0xdb, 0x88, 0x7b, 0xc1, 0xb6, 0x08, 0x2d, 0xdf, 0x25, 0x9d, 0x32, -0x76, 0x49, 0x0b, 0xba, 0xab, 0xdd, 0xc3, 0x00, 0x76, 0x8a, 0x94, 0xd2, 0x25, 0x43, 0xf0, 0xa9, -0x98, 0x65, 0x94, 0xc7, 0xdd, 0x7c, 0xd4, 0xe2, 0xe8, 0x33, 0xe2, 0x9a, 0xe9, 0x75, 0xf0, 0x0f, -0x61, 0x86, 0xee, 0x0e, 0xf7, 0x39, 0x6b, 0x30, 0x63, 0xe5, 0x46, 0xd4, 0x1c, 0x83, 0xa1, 0x28, -0x79, 0x76, 0x81, 0x48, 0x38, 0x72, 0xbc, 0x3f, 0x25, 0x53, 0x31, 0xaa, 0x02, 0xd1, 0x9b, 0x03, -0xa2, 0x5c, 0x94, 0x21, 0xb3, 0x8e, 0xdf, 0x2a, 0xa5, 0x4c, 0x65, 0xa2, 0xf9, 0xac, 0x38, 0x7a, -0xf9, 0x45, 0xb3, 0xd5, 0xda, 0xe5, 0xb9, 0x56, 0x9e, 0x47, 0xd5, 0x06, 0xe6, 0xca, 0xd7, 0x6e, -0x06, 0xdb, 0x6e, 0xa7, 0x7b, 0x4b, 0x13, 0x40, 0x3c, 0x12, 0x76, 0x99, 0x65, 0xb4, 0x54, 0xa1, -0xd8, 0x21, 0x5c, 0x27 -}; + 0x30, 0x82, 0x03, 0x00, 0x30, 0x82, 0x01, 0xec, 0xa0, 0x03, 0x02, 0x01, + 0x02, 0x02, 0x10, 0xbd, + 0x76, 0xdf, 0x42, 0x47, 0x0a, 0x00, 0x8d, 0x47, 0x3e, 0x74, 0x3f, 0xa1, + 0xdc, 0x8b, 0xbd, 0x30, + 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1d, 0x05, 0x00, 0x30, 0x2d, + 0x31, 0x2b, 0x30, 0x29, + 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x22, 0x77, 0x00, 0x32, 0x00, 0x6b, + 0x00, 0x38, 0x00, 0x72, + 0x00, 0x32, 0x00, 0x2e, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x74, 0x00, 0x77, + 0x00, 0x73, 0x00, 0x2e, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x74, 0x00, 0x00, 0x00, 0x30, 0x1e, 0x17, + 0x0d, 0x31, 0x30, 0x30, + 0x34, 0x32, 0x38, 0x31, 0x31, 0x34, 0x31, 0x35, 0x34, 0x5a, 0x17, 0x0d, + 0x31, 0x31, 0x30, 0x34, + 0x32, 0x38, 0x31, 0x31, 0x34, 0x31, 0x35, 0x34, 0x5a, 0x30, 0x2d, 0x31, + 0x2b, 0x30, 0x29, 0x06, + 0x03, 0x55, 0x04, 0x03, 0x13, 0x22, 0x77, 0x00, 0x32, 0x00, 0x6b, 0x00, + 0x38, 0x00, 0x72, 0x00, + 0x32, 0x00, 0x2e, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x74, 0x00, 0x77, 0x00, + 0x73, 0x00, 0x2e, 0x00, + 0x6e, 0x00, 0x65, 0x00, 0x74, 0x00, 0x00, 0x00, 0x30, 0x82, 0x01, 0x22, + 0x30, 0x0d, 0x06, 0x09, + 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, + 0x82, 0x01, 0x0f, 0x00, + 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xaa, 0xd7, 0x32, + 0x26, 0xd7, 0xfc, 0x69, + 0x57, 0x4a, 0x55, 0x08, 0x2b, 0x97, 0xc1, 0x5b, 0x90, 0xfd, 0xe8, 0xf5, + 0xf7, 0x9e, 0x7d, 0x34, + 0xce, 0xe9, 0xbb, 0x38, 0xa0, 0x9f, 0xec, 0x84, 0x86, 0x3e, 0x47, 0x2e, + 0x71, 0xd7, 0xc3, 0xbf, + 0x89, 0xf3, 0x80, 0xb5, 0x77, 0x80, 0xd3, 0xb0, 0x56, 0x6b, 0x9c, 0xf4, + 0xd3, 0x42, 0x2b, 0x26, + 0x01, 0x5c, 0x42, 0xef, 0xf6, 0x51, 0x5a, 0xaa, 0x55, 0x6b, 0x30, 0xd3, + 0x2c, 0xdc, 0xde, 0x36, + 0x4d, 0xdd, 0xf3, 0x5f, 0x59, 0xba, 0x57, 0xd8, 0x39, 0x0f, 0x5b, 0xd3, + 0xe1, 0x34, 0x39, 0x22, + 0xaa, 0x71, 0x10, 0x59, 0x7a, 0xec, 0x9f, 0x1a, 0xf5, 0xa9, 0x40, 0xd6, + 0x7b, 0x32, 0x5f, 0x19, + 0x85, 0xc0, 0xfd, 0xa6, 0x6c, 0x32, 0x58, 0xdc, 0x7c, 0x07, 0x42, 0x36, + 0xd0, 0x57, 0x78, 0x63, + 0x60, 0x92, 0x1d, 0x1f, 0x9d, 0xbd, 0xcc, 0xd7, 0xe3, 0x1a, 0x57, 0xdb, + 0x70, 0x80, 0x89, 0x36, + 0x39, 0x01, 0x71, 0x5a, 0x2a, 0x05, 0x25, 0x13, 0x80, 0xf8, 0x49, 0x48, + 0x5f, 0x06, 0xd0, 0xcb, + 0x2c, 0x58, 0x9a, 0xe7, 0x8b, 0x6d, 0x17, 0x2c, 0xb2, 0x97, 0x2c, 0x15, + 0xc9, 0x73, 0x6d, 0x8f, + 0x4f, 0xf3, 0xf1, 0xb9, 0x70, 0x3f, 0xcb, 0x5f, 0x80, 0x85, 0x8b, 0xdf, + 0xd2, 0x05, 0x95, 0x1c, + 0xe4, 0x37, 0xee, 0xd2, 0x62, 0x49, 0x08, 0xdf, 0xf6, 0x02, 0xec, 0xe6, + 0x9a, 0x37, 0xfc, 0x21, + 0x7a, 0x98, 0x12, 0x1d, 0x79, 0xbf, 0xc7, 0x0f, 0x0a, 0x20, 0xf8, 0xef, + 0xa5, 0xc6, 0x0e, 0x94, + 0x5e, 0x17, 0x94, 0x12, 0x42, 0xfe, 0xd7, 0x22, 0xbd, 0x31, 0x27, 0xc7, + 0xdb, 0x4a, 0x4e, 0x95, + 0xe2, 0xc1, 0xdd, 0xe8, 0x0f, 0x7d, 0x1d, 0xe4, 0xfd, 0xb1, 0x27, 0x7b, + 0xc1, 0x71, 0xfe, 0x27, + 0x47, 0x89, 0xf4, 0xfc, 0x84, 0xa5, 0x57, 0x5d, 0x21, 0x02, 0x03, 0x01, + 0x00, 0x01, 0x81, 0x11, + 0x00, 0xbd, 0x8b, 0xdc, 0xa1, 0x3f, 0x74, 0x3e, 0x47, 0x8d, 0x00, 0x0a, + 0x47, 0x42, 0xdf, 0x76, + 0xbd, 0x82, 0x11, 0x00, 0xbd, 0x8b, 0xdc, 0xa1, 0x3f, 0x74, 0x3e, 0x47, + 0x8d, 0x00, 0x0a, 0x47, + 0x42, 0xdf, 0x76, 0xbd, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, + 0x1d, 0x05, 0x00, 0x03, + 0x82, 0x01, 0x01, 0x00, 0xa7, 0xb0, 0x66, 0x75, 0x14, 0x7e, 0x7d, 0xb5, + 0x31, 0xec, 0xb2, 0xeb, + 0x90, 0x80, 0x95, 0x25, 0x59, 0x0f, 0xe4, 0x15, 0x86, 0x2d, 0x9d, 0xd7, + 0x35, 0xe9, 0x22, 0x74, + 0xe7, 0x85, 0x36, 0x19, 0x4f, 0x27, 0x5c, 0x17, 0x63, 0x7b, 0x2a, 0xfe, + 0x59, 0xe9, 0x76, 0x77, + 0xd0, 0xc9, 0x40, 0x78, 0x7c, 0x31, 0x62, 0x1e, 0x87, 0x1b, 0xc1, 0x19, + 0xef, 0x6f, 0x15, 0xe6, + 0xce, 0x74, 0x84, 0x6d, 0xd6, 0x3b, 0x57, 0xd9, 0xa9, 0x13, 0xf6, 0x7d, + 0x84, 0xe7, 0x8f, 0xc6, + 0x01, 0x5f, 0xcf, 0xc4, 0x95, 0xc9, 0xde, 0x97, 0x17, 0x43, 0x12, 0x70, + 0x27, 0xf9, 0xc4, 0xd7, + 0xe1, 0x05, 0xbb, 0x63, 0x87, 0x5f, 0xdc, 0x20, 0xbd, 0xd1, 0xde, 0xd6, + 0x2d, 0x9f, 0x3f, 0x5d, + 0x0a, 0x27, 0x40, 0x11, 0x5f, 0x5d, 0x54, 0xa7, 0x28, 0xf9, 0x03, 0x2e, + 0x84, 0x8d, 0x48, 0x60, + 0xa1, 0x71, 0xa3, 0x46, 0x69, 0xdb, 0x88, 0x7b, 0xc1, 0xb6, 0x08, 0x2d, + 0xdf, 0x25, 0x9d, 0x32, + 0x76, 0x49, 0x0b, 0xba, 0xab, 0xdd, 0xc3, 0x00, 0x76, 0x8a, 0x94, 0xd2, + 0x25, 0x43, 0xf0, 0xa9, + 0x98, 0x65, 0x94, 0xc7, 0xdd, 0x7c, 0xd4, 0xe2, 0xe8, 0x33, 0xe2, 0x9a, + 0xe9, 0x75, 0xf0, 0x0f, + 0x61, 0x86, 0xee, 0x0e, 0xf7, 0x39, 0x6b, 0x30, 0x63, 0xe5, 0x46, 0xd4, + 0x1c, 0x83, 0xa1, 0x28, + 0x79, 0x76, 0x81, 0x48, 0x38, 0x72, 0xbc, 0x3f, 0x25, 0x53, 0x31, 0xaa, + 0x02, 0xd1, 0x9b, 0x03, + 0xa2, 0x5c, 0x94, 0x21, 0xb3, 0x8e, 0xdf, 0x2a, 0xa5, 0x4c, 0x65, 0xa2, + 0xf9, 0xac, 0x38, 0x7a, + 0xf9, 0x45, 0xb3, 0xd5, 0xda, 0xe5, 0xb9, 0x56, 0x9e, 0x47, 0xd5, 0x06, + 0xe6, 0xca, 0xd7, 0x6e, + 0x06, 0xdb, 0x6e, 0xa7, 0x7b, 0x4b, 0x13, 0x40, 0x3c, 0x12, 0x76, 0x99, + 0x65, 0xb4, 0x54, 0xa1, + 0xd8, 0x21, 0x5c, 0x27 + }; gnutls_datum_t derCert = { der, sizeof (der) }; gnutls_x509_crt_t cert; int result; - unsigned char expectedId[] = { 0xbd, 0x8b, 0xdc, 0xa1, 0x3f, 0x74, 0x3e, 0x47, 0x8d, 0x00, 0x0a, 0x47, 0x42, 0xdf, 0x76, 0xbd }; + unsigned char expectedId[] = + { 0xbd, 0x8b, 0xdc, 0xa1, 0x3f, 0x74, 0x3e, 0x47, 0x8d, 0x00, 0x0a, 0x47, + 0x42, 0xdf, 0x76, 0xbd + }; char buf[17]; ssize_t buf_size; @@ -114,12 +165,12 @@ doit (void) fail ("get_issuer_unique_id short error %d\n", result); if (buf_size != 16) fail ("get_issuer_unique_id buf size %zd\n", buf_size); - + buf_size = 16; result = gnutls_x509_crt_get_issuer_unique_id (cert, buf, &buf_size); if (result < 0) fail ("get_issuer_unique_id %d\n", result); - if (memcmp(buf, expectedId, buf_size) != 0) + if (memcmp (buf, expectedId, buf_size) != 0) fail ("expected id mismatch for issuer\n"); buf_size = 15; @@ -128,14 +179,14 @@ doit (void) fail ("get_subject_unique_id short error %d\n", result); if (buf_size != 16) fail ("get_subject_unique_id buf size %zd\n", buf_size); - + buf_size = 16; result = gnutls_x509_crt_get_subject_unique_id (cert, buf, &buf_size); if (result < 0) - fail ("get_subject_unique_id %d\n", result); - if (memcmp(buf, expectedId, buf_size) != 0) + fail ("get_subject_unique_id %d\n", result); + if (memcmp (buf, expectedId, buf_size) != 0) fail ("expected id mismatch for subject\n"); - + gnutls_x509_crt_deinit (cert); gnutls_global_deinit (); diff --git a/tests/chainverify.c b/tests/chainverify.c index 8aa7a0fcab..f5b8f89860 100644 --- a/tests/chainverify.c +++ b/tests/chainverify.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/crq_apis.c b/tests/crq_apis.c index 8fa593b868..f61e89cd2a 100644 --- a/tests/crq_apis.c +++ b/tests/crq_apis.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdlib.h> diff --git a/tests/crq_key_id.c b/tests/crq_key_id.c index dd2be8abc1..6696ba7132 100644 --- a/tests/crq_key_id.c +++ b/tests/crq_key_id.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdlib.h> diff --git a/tests/crypto_rng.c b/tests/crypto_rng.c index e4b20404f6..fbeb10c5af 100644 --- a/tests/crypto_rng.c +++ b/tests/crypto_rng.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/cve-2008-4989.c b/tests/cve-2008-4989.c index d3f0354eb0..40af8623d8 100644 --- a/tests/cve-2008-4989.c +++ b/tests/cve-2008-4989.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/cve-2009-1415.c b/tests/cve-2009-1415.c index 69b85754e6..2a20178c5c 100644 --- a/tests/cve-2009-1415.c +++ b/tests/cve-2009-1415.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif /* diff --git a/tests/cve-2009-1416.c b/tests/cve-2009-1416.c index 1e91116d53..784521fcd7 100644 --- a/tests/cve-2009-1416.c +++ b/tests/cve-2009-1416.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif /* diff --git a/tests/dhepskself.c b/tests/dhepskself.c index 3ddbb2111f..54c48134c1 100644 --- a/tests/dhepskself.c +++ b/tests/dhepskself.c @@ -24,7 +24,7 @@ /* Parts copied from GnuTLS example programs. */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/dn.c b/tests/dn.c index 4ff06d528f..d86af537c0 100644 --- a/tests/dn.c +++ b/tests/dn.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include <stdio.h> diff --git a/tests/dn2.c b/tests/dn2.c index 42627d3e57..3caccd4291 100644 --- a/tests/dn2.c +++ b/tests/dn2.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include <stdio.h> diff --git a/tests/finished.c b/tests/finished.c index ac7aca36d6..afbdbcf572 100644 --- a/tests/finished.c +++ b/tests/finished.c @@ -23,7 +23,7 @@ /* Based on mini.c. */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/gc.c b/tests/gc.c index bb1a485935..3f0b1b8353 100644 --- a/tests/gc.c +++ b/tests/gc.c @@ -19,7 +19,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/hostname-check.c b/tests/hostname-check.c index dbf5c1b6ce..918257e18c 100644 --- a/tests/hostname-check.c +++ b/tests/hostname-check.c @@ -21,14 +21,14 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <string.h> #include <gnutls/gnutls.h> #include <gnutls/x509.h> #ifdef ENABLE_OPENPGP -# include <gnutls/openpgp.h> +#include <gnutls/openpgp.h> #endif #include "utils.h" diff --git a/tests/init_roundtrip.c b/tests/init_roundtrip.c index 7a0d3b1803..f9922734e8 100644 --- a/tests/init_roundtrip.c +++ b/tests/init_roundtrip.c @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/mini-eagain.c b/tests/mini-eagain.c index a83f7f9351..7dbbce6d26 100644 --- a/tests/mini-eagain.c +++ b/tests/mini-eagain.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> @@ -229,7 +229,7 @@ doit (void) fail ("server: didn't receive any data\n"); else if (ret < 0) { -// if (debug) +// if (debug) // fputs ("#", stdout); if (ret != GNUTLS_E_AGAIN) { @@ -240,14 +240,16 @@ doit (void) else { transferred += ret; -// if (debug) -// fputs ("*", stdout); +// if (debug) +// fputs ("*", stdout); } - msglen = strlen(MSG); - do { - ns = gnutls_record_send (server, MSG, msglen); - } while(ns == GNUTLS_E_AGAIN); + msglen = strlen (MSG); + do + { + ns = gnutls_record_send (server, MSG, msglen); + } + while (ns == GNUTLS_E_AGAIN); ret = gnutls_record_recv (client, buffer, MAX_BUF); if (ret == 0) @@ -257,7 +259,7 @@ doit (void) else if (ret < 0) { if (debug) - fputs ("!", stdout); + fputs ("!", stdout); if (ret != GNUTLS_E_AGAIN) { fail ("client: Error: %s\n", gnutls_strerror (ret)); @@ -266,14 +268,17 @@ doit (void) } else { - if (msglen != ret || memcmp(buffer, MSG, msglen) != 0) { + if (msglen != ret || memcmp (buffer, MSG, msglen) != 0) + { fail ("client: Transmitted data do not match\n"); - } + } - /* echo back */ - do { - ns = gnutls_record_send (client, buffer, msglen); - } while(ns == GNUTLS_E_AGAIN); + /* echo back */ + do + { + ns = gnutls_record_send (client, buffer, msglen); + } + while (ns == GNUTLS_E_AGAIN); transferred += ret; if (debug) diff --git a/tests/mini-x509-rehandshake.c b/tests/mini-x509-rehandshake.c index feafa7e3c0..f95c3796f6 100644 --- a/tests/mini-x509-rehandshake.c +++ b/tests/mini-x509-rehandshake.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> @@ -274,10 +274,10 @@ main (int argc, char *argv[]) } } while ( - /* Not done: */ - !(cret == GNUTLS_E_SUCCESS && sret == GNUTLS_E_SUCCESS) - /* No error: */ - && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); + /* Not done: */ + !(cret == GNUTLS_E_SUCCESS && sret == GNUTLS_E_SUCCESS) + /* No error: */ + && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); if (cret != GNUTLS_E_SUCCESS && sret != GNUTLS_E_SUCCESS) exit_code = 1; diff --git a/tests/mini-x509.c b/tests/mini-x509.c index 0f29ab13c8..551da19961 100644 --- a/tests/mini-x509.c +++ b/tests/mini-x509.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/mini.c b/tests/mini.c index 585b6343ec..54706c021f 100644 --- a/tests/mini.c +++ b/tests/mini.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/moredn.c b/tests/moredn.c index a0566557f4..115686dc84 100644 --- a/tests/moredn.c +++ b/tests/moredn.c @@ -23,7 +23,7 @@ /* Parts copied from GnuTLS example programs. */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/mpi.c b/tests/mpi.c index 92470fdfd9..f670490b45 100644 --- a/tests/mpi.c +++ b/tests/mpi.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/netconf-psk.c b/tests/netconf-psk.c index 36c0ae1c72..2d606d4bf5 100644 --- a/tests/netconf-psk.c +++ b/tests/netconf-psk.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/nul-in-x509-names.c b/tests/nul-in-x509-names.c index 9225f74a43..f8bf78283f 100644 --- a/tests/nul-in-x509-names.c +++ b/tests/nul-in-x509-names.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdlib.h> diff --git a/tests/openpgp-auth.c b/tests/openpgp-auth.c index 09b5d88371..13e7693cdf 100644 --- a/tests/openpgp-auth.c +++ b/tests/openpgp-auth.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <gnutls/gnutls.h> @@ -43,41 +43,40 @@ static const char message[] = "Hello, brave GNU world!"; /* The OpenPGP key pair for use and the key ID in those keys. */ static const char pub_key_file[] = "../guile/tests/openpgp-pub.asc"; static const char priv_key_file[] = "../guile/tests/openpgp-sec.asc"; -static const char *key_id = - NULL +static const char *key_id = NULL /* FIXME: The values below don't work as expected. */ /* "auto" */ - /* "bd572cdcccc07c35" */; + /* "bd572cdcccc07c35" */ ; static const char rsa_params_file[] = "../guile/tests/rsa-parameters.pem"; static const int protocols[] = { GNUTLS_TLS1_0, 0 }; static const int cert_types[] = { GNUTLS_CRT_OPENPGP, 0 }; -static const int ciphers[] = - { - GNUTLS_CIPHER_NULL, GNUTLS_CIPHER_ARCFOUR, - GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_AES_256_CBC, - 0 - }; -static const int kx[] = - { - GNUTLS_KX_RSA, GNUTLS_KX_RSA_EXPORT, - GNUTLS_KX_DHE_RSA, GNUTLS_KX_DHE_DSS, - 0 - }; -static const int macs[] = - { - GNUTLS_MAC_SHA1, GNUTLS_MAC_RMD160, GNUTLS_MAC_MD5, - 0 - }; + +static const int ciphers[] = { + GNUTLS_CIPHER_NULL, GNUTLS_CIPHER_ARCFOUR, + GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_AES_256_CBC, + 0 +}; + +static const int kx[] = { + GNUTLS_KX_RSA, GNUTLS_KX_RSA_EXPORT, + GNUTLS_KX_DHE_RSA, GNUTLS_KX_DHE_DSS, + 0 +}; + +static const int macs[] = { + GNUTLS_MAC_SHA1, GNUTLS_MAC_RMD160, GNUTLS_MAC_MD5, + 0 +}; static void log_message (int level, const char *message) { fprintf (stderr, "[%5d|%2d] %s", getpid (), level, message); } - + void doit () { @@ -89,7 +88,7 @@ doit () gnutls_global_init (); - srcdir = getenv ("srcdir") ?: "."; + srcdir = getenv ("srcdir") ? : "."; if (debug) { @@ -131,7 +130,8 @@ doit () gnutls_set_default_priority (session); gnutls_transport_set_ptr (session, - (gnutls_transport_ptr_t)(intptr_t) sockets[0]); + (gnutls_transport_ptr_t) (intptr_t) + sockets[0]); err = gnutls_certificate_allocate_credentials (&cred); if (err != 0) @@ -196,7 +196,8 @@ doit () gnutls_set_default_priority (session); gnutls_transport_set_ptr (session, - (gnutls_transport_ptr_t)(intptr_t) sockets[1]); + (gnutls_transport_ptr_t) (intptr_t) + sockets[1]); err = gnutls_certificate_allocate_credentials (&cred); if (err != 0) @@ -212,16 +213,16 @@ doit () err = gnutls_dh_params_init (&dh_params); if (err) - fail ("server DH params init %d\n", err); + fail ("server DH params init %d\n", err); err = gnutls_dh_params_generate2 (dh_params, 1024); if (err) - fail ("server DH params generate %d\n", err); + fail ("server DH params generate %d\n", err); gnutls_certificate_set_dh_params (cred, dh_params); rsa_data.data = - (unsigned char *) read_binary_file (rsa_params_file, &rsa_size); + (unsigned char *) read_binary_file (rsa_params_file, &rsa_size); rsa_data.size = rsa_size; err = gnutls_rsa_params_init (&rsa_params); diff --git a/tests/openpgp-keyring.c b/tests/openpgp-keyring.c index b505db806d..6e3224d080 100644 --- a/tests/openpgp-keyring.c +++ b/tests/openpgp-keyring.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include <stdio.h> diff --git a/tests/openpgpself.c b/tests/openpgpself.c index 2e9e543177..3732d3b39f 100644 --- a/tests/openpgpself.c +++ b/tests/openpgpself.c @@ -24,7 +24,7 @@ /* Parts copied from GnuTLS example programs. */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/openssl.c b/tests/openssl.c index 05e43d900f..188d82e9b2 100644 --- a/tests/openssl.c +++ b/tests/openssl.c @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/parse_ca.c b/tests/parse_ca.c index 5791a958cf..9f81887e27 100644 --- a/tests/parse_ca.c +++ b/tests/parse_ca.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/pgps2kgnu.c b/tests/pgps2kgnu.c index bb458610ee..1076bdea4f 100644 --- a/tests/pgps2kgnu.c +++ b/tests/pgps2kgnu.c @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/pkcs12_encode.c b/tests/pkcs12_encode.c index 42ff96d806..e69104f7e1 100644 --- a/tests/pkcs12_encode.c +++ b/tests/pkcs12_encode.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <gnutls/gnutls.h> @@ -151,7 +151,8 @@ doit (void) i == 0 ? GNUTLS_PKCS8_USE_PKCS12_3DES : GNUTLS_PKCS_USE_PKCS12_RC2_40); if (ret < 0) - error (EXIT_FAILURE, 0, "bag_encrypt: %d: %s", ret, i==0?"3DES":"RC2-40"); + error (EXIT_FAILURE, 0, "bag_encrypt: %d: %s", ret, + i == 0 ? "3DES" : "RC2-40"); ret = gnutls_pkcs12_set_bag (pkcs12, bag); if (ret < 0) diff --git a/tests/pkcs12_s2k.c b/tests/pkcs12_s2k.c index 671a44bddd..41c8d1299f 100644 --- a/tests/pkcs12_s2k.c +++ b/tests/pkcs12_s2k.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> @@ -133,12 +133,14 @@ doit (void) fail ("_gnutls_pkcs12_string_to_key failed[0]: %d\n", rc); if (strcmp (_gnutls_bin2hex (key, sizeof (key), - tmp, sizeof (tmp), NULL), values[x]) != 0) + tmp, sizeof (tmp), NULL), + values[x]) != 0) fail ("_gnutls_pkcs12_string_to_key failed[1]\n"); if (debug) printf ("ij: %d.%d: %s\n", i, j, - _gnutls_bin2hex (key, sizeof (key), tmp, sizeof (tmp), NULL)); + _gnutls_bin2hex (key, sizeof (key), tmp, sizeof (tmp), + NULL)); x++; } } diff --git a/tests/pkcs12_s2k_pem.c b/tests/pkcs12_s2k_pem.c index 165dbbd2fc..ccbd35455b 100644 --- a/tests/pkcs12_s2k_pem.c +++ b/tests/pkcs12_s2k_pem.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif /* diff --git a/tests/pskself.c b/tests/pskself.c index 1de6e5c9e8..052e09027b 100644 --- a/tests/pskself.c +++ b/tests/pskself.c @@ -23,7 +23,7 @@ /* Parts copied from GnuTLS example programs. */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/resume.c b/tests/resume.c index 488dd8c20d..76078b4a59 100644 --- a/tests/resume.c +++ b/tests/resume.c @@ -24,7 +24,7 @@ /* Parts copied from GnuTLS example programs. */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/safe-renegotiation/srn0.c b/tests/safe-renegotiation/srn0.c index 351cf71328..7310225578 100644 --- a/tests/safe-renegotiation/srn0.c +++ b/tests/safe-renegotiation/srn0.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> @@ -289,10 +289,10 @@ main (int argc, char *argv[]) } } while ( - /* Not done: */ - !(cret == GNUTLS_E_SUCCESS && sret == GNUTLS_E_SUCCESS) - /* No error: */ - && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); + /* Not done: */ + !(cret == GNUTLS_E_SUCCESS && sret == GNUTLS_E_SUCCESS) + /* No error: */ + && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); if (cret != GNUTLS_E_SUCCESS && sret != GNUTLS_E_SUCCESS) exit_code = 1; @@ -300,7 +300,8 @@ main (int argc, char *argv[]) if (!gnutls_safe_renegotiation_status (client) || !gnutls_safe_renegotiation_status (server)) { - tls_log_func (0, "Rehandshaked session not using safe renegotiation!\n"); + tls_log_func (0, + "Rehandshaked session not using safe renegotiation!\n"); exit_code = EXIT_FAILURE; } diff --git a/tests/safe-renegotiation/srn1.c b/tests/safe-renegotiation/srn1.c index 8cc0d5c213..ee40c3a796 100644 --- a/tests/safe-renegotiation/srn1.c +++ b/tests/safe-renegotiation/srn1.c @@ -28,7 +28,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> @@ -184,8 +184,7 @@ main (int argc, char *argv[]) GNUTLS_X509_FMT_PEM); gnutls_init (&server, GNUTLS_SERVER); gnutls_credentials_set (server, GNUTLS_CRD_CERTIFICATE, serverx509cred); - gnutls_priority_set_direct (server, "NORMAL:%SAFE_RENEGOTIATION", - NULL); + gnutls_priority_set_direct (server, "NORMAL:%SAFE_RENEGOTIATION", NULL); gnutls_transport_set_push_function (server, server_push); gnutls_transport_set_pull_function (server, server_pull); diff --git a/tests/safe-renegotiation/srn2.c b/tests/safe-renegotiation/srn2.c index 726ca1b51f..6bc92e9a24 100644 --- a/tests/safe-renegotiation/srn2.c +++ b/tests/safe-renegotiation/srn2.c @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> @@ -295,10 +295,10 @@ main (int argc, char *argv[]) } } while ( - /* Not done: */ - !(cret == GNUTLS_E_SUCCESS && sret == GNUTLS_E_SUCCESS) - /* No error: */ - && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); + /* Not done: */ + !(cret == GNUTLS_E_SUCCESS && sret == GNUTLS_E_SUCCESS) + /* No error: */ + && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); if (cret != GNUTLS_E_SUCCESS && sret != GNUTLS_E_SUCCESS) exit_code = 1; @@ -313,7 +313,7 @@ main (int argc, char *argv[]) /* Check that this API does not affect anything after first handshake. - gnutls_safe_negotiation_set_initial (server, 0); */ + gnutls_safe_negotiation_set_initial (server, 0); */ sret = gnutls_rehandshake (server); if (debug_level > 0) @@ -363,10 +363,10 @@ main (int argc, char *argv[]) } } while ( - /* Not done: */ - !(cret == GNUTLS_E_SUCCESS && sret == GNUTLS_E_SUCCESS) - /* No error: */ - && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); + /* Not done: */ + !(cret == GNUTLS_E_SUCCESS && sret == GNUTLS_E_SUCCESS) + /* No error: */ + && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); if (cret != GNUTLS_E_SUCCESS && sret != GNUTLS_E_SUCCESS) exit_code = 1; @@ -422,10 +422,10 @@ main (int argc, char *argv[]) } } while ( - /* Not done: */ - !(cret == GNUTLS_E_SUCCESS && sret == GNUTLS_E_SUCCESS) - /* No error: */ - && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); + /* Not done: */ + !(cret == GNUTLS_E_SUCCESS && sret == GNUTLS_E_SUCCESS) + /* No error: */ + && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); if (cret != GNUTLS_E_SUCCESS && sret != GNUTLS_E_SUCCESS) exit_code = 1; diff --git a/tests/safe-renegotiation/srn3.c b/tests/safe-renegotiation/srn3.c index de821e93c4..06457a2dc1 100644 --- a/tests/safe-renegotiation/srn3.c +++ b/tests/safe-renegotiation/srn3.c @@ -28,7 +28,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> @@ -193,8 +193,7 @@ main (int argc, char *argv[]) gnutls_certificate_allocate_credentials (&clientx509cred); gnutls_init (&client, GNUTLS_CLIENT); gnutls_credentials_set (client, GNUTLS_CRD_CERTIFICATE, clientx509cred); - gnutls_priority_set_direct (client, "NORMAL:%SAFE_RENEGOTIATION", - NULL); + gnutls_priority_set_direct (client, "NORMAL:%SAFE_RENEGOTIATION", NULL); gnutls_transport_set_push_function (client, client_push); gnutls_transport_set_pull_function (client, client_pull); diff --git a/tests/safe-renegotiation/srn4.c b/tests/safe-renegotiation/srn4.c index a0d8c62c19..488a0c3b69 100644 --- a/tests/safe-renegotiation/srn4.c +++ b/tests/safe-renegotiation/srn4.c @@ -28,7 +28,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> @@ -289,11 +289,11 @@ main (int argc, char *argv[]) } } while ( - /* Not done: */ - !(cret == GNUTLS_E_AGAIN - && sret == GNUTLS_E_UNSAFE_RENEGOTIATION_DENIED) - /* No error: */ - && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); + /* Not done: */ + !(cret == GNUTLS_E_AGAIN + && sret == GNUTLS_E_UNSAFE_RENEGOTIATION_DENIED) + /* No error: */ + && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); if (cret != GNUTLS_E_AGAIN && sret != GNUTLS_E_UNSAFE_RENEGOTIATION_DENIED) exit_code = 1; @@ -301,7 +301,8 @@ main (int argc, char *argv[]) if (gnutls_safe_renegotiation_status (client) || gnutls_safe_renegotiation_status (server)) { - tls_log_func (0, "Rehandshaked session not using safe renegotiation!\n"); + tls_log_func (0, + "Rehandshaked session not using safe renegotiation!\n"); exit_code = EXIT_FAILURE; } diff --git a/tests/safe-renegotiation/srn5.c b/tests/safe-renegotiation/srn5.c index 477ebb75a0..91d1b9474f 100644 --- a/tests/safe-renegotiation/srn5.c +++ b/tests/safe-renegotiation/srn5.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> @@ -295,11 +295,11 @@ main (int argc, char *argv[]) } } while ( - /* Not done: */ - !(sret == GNUTLS_E_AGAIN - && cret == GNUTLS_E_UNSAFE_RENEGOTIATION_DENIED) - /* No error: */ - && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); + /* Not done: */ + !(sret == GNUTLS_E_AGAIN + && cret == GNUTLS_E_UNSAFE_RENEGOTIATION_DENIED) + /* No error: */ + && (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN)); if (sret != GNUTLS_E_AGAIN && cret != GNUTLS_E_UNSAFE_RENEGOTIATION_DENIED) exit_code = 1; @@ -307,7 +307,8 @@ main (int argc, char *argv[]) if (gnutls_safe_renegotiation_status (client) || gnutls_safe_renegotiation_status (server)) { - tls_log_func (0, "Rehandshaked session not using safe renegotiation!\n"); + tls_log_func (0, + "Rehandshaked session not using safe renegotiation!\n"); exit_code = EXIT_FAILURE; } diff --git a/tests/set_pkcs12_cred.c b/tests/set_pkcs12_cred.c index 6a4109fe2f..579e7aaa6b 100644 --- a/tests/set_pkcs12_cred.c +++ b/tests/set_pkcs12_cred.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdlib.h> diff --git a/tests/setcredcrash.c b/tests/setcredcrash.c index 7a6803a5d6..61225a3520 100644 --- a/tests/setcredcrash.c +++ b/tests/setcredcrash.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/simple.c b/tests/simple.c index 17d0cb55fa..4124876b14 100644 --- a/tests/simple.c +++ b/tests/simple.c @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/tlsia.c b/tests/tlsia.c index c97ce9517f..d4ebce4a66 100644 --- a/tests/tlsia.c +++ b/tests/tlsia.c @@ -24,7 +24,7 @@ /* Parts copied from GnuTLS example programs. */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/utils.c b/tests/utils.c index eb55d1f133..946c62d39d 100644 --- a/tests/utils.c +++ b/tests/utils.c @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include <stdio.h> diff --git a/tests/utils.h b/tests/utils.h index e5fd600d0b..47db94f61e 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -22,16 +22,16 @@ */ #ifndef UTILS_H -# define UTILS_H +#define UTILS_H -# include <string.h> -# include <stdarg.h> -# include <gnutls/gnutls.h> +#include <string.h> +#include <stdarg.h> +#include <gnutls/gnutls.h> #ifndef __attribute__ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) -# define __attribute__(Spec) /* empty */ -# endif +#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) +#define __attribute__(Spec) /* empty */ +#endif #endif extern int debug; diff --git a/tests/x509_altname.c b/tests/x509_altname.c index 707b568623..432b44fb98 100644 --- a/tests/x509_altname.c +++ b/tests/x509_altname.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include <stdio.h> diff --git a/tests/x509dn.c b/tests/x509dn.c index a68af097a5..6095b3a8d2 100644 --- a/tests/x509dn.c +++ b/tests/x509dn.c @@ -24,7 +24,7 @@ /* Parts copied from GnuTLS example programs. */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/x509self.c b/tests/x509self.c index f10a51f331..0039a49398 100644 --- a/tests/x509self.c +++ b/tests/x509self.c @@ -24,7 +24,7 @@ /* Parts copied from GnuTLS example programs. */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> diff --git a/tests/x509sign-verify.c b/tests/x509sign-verify.c index 1eb749066f..1eb86f516b 100644 --- a/tests/x509sign-verify.c +++ b/tests/x509sign-verify.c @@ -24,7 +24,7 @@ /* Parts copied from GnuTLS example programs. */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> |