diff options
Diffstat (limited to 'tests/x509sign-verify-common.h')
| -rw-r--r-- | tests/x509sign-verify-common.h | 55 |
1 files changed, 24 insertions, 31 deletions
diff --git a/tests/x509sign-verify-common.h b/tests/x509sign-verify-common.h index 6b7498586b..fd1ee4de0c 100644 --- a/tests/x509sign-verify-common.h +++ b/tests/x509sign-verify-common.h @@ -1,5 +1,5 @@ #ifndef GNUTLS_TESTS_X509SIGN_VERIFY_COMMON_H -#define GNUTLS_TESTS_X509SIGN_VERIFY_COMMON_H +# define GNUTLS_TESTS_X509SIGN_VERIFY_COMMON_H static void tls_log_func(int level, const char *str) { @@ -19,8 +19,7 @@ const gnutls_datum_t sha256_data = { (void *) "\x2c\xf2\x4d\xba\x5f\xb0\xa3\x0e\x26\xe8" "\x3b\x2a\xc5\xb9\xe2\x9e\x1b\x16\x1e\x5c" - "\x1f\xa7\x42\x5e\x73\x04\x33\x62\x93\x8b" - "\x98\x24", + "\x1f\xa7\x42\x5e\x73\x04\x33\x62\x93\x8b" "\x98\x24", 32 }; @@ -29,8 +28,7 @@ const gnutls_datum_t gostr94_data = { (void *) "\x92\xea\x6d\xdb\xaf\x40\x02\x0d\xf3\x65" "\x1f\x27\x8f\xd7\x15\x12\x17\xa2\x4a\xa8" - "\xd2\x2e\xbd\x25\x19\xcf\xd4\xd8\x9e\x64" - "\x50\xea", + "\xd2\x2e\xbd\x25\x19\xcf\xd4\xd8\x9e\x64" "\x50\xea", 32 }; @@ -39,8 +37,7 @@ const gnutls_datum_t streebog256_data = { (void *) "\x3f\xb0\x70\x0a\x41\xce\x6e\x41\x41\x3b" "\xa7\x64\xf9\x8b\xf2\x13\x5b\xa6\xde\xd5" - "\x16\xbe\xa2\xfa\xe8\x42\x9c\xc5\xbd\xd4" - "\x6d\x6d", + "\x16\xbe\xa2\xfa\xe8\x42\x9c\xc5\xbd\xd4" "\x6d\x6d", 32 }; @@ -52,8 +49,7 @@ const gnutls_datum_t streebog512_data = { "\x7e\xb3\xdd\x43\x11\xe8\xb5\x85\xd4\xbf" "\x2f\x59\x23\x21\x4f\x1d\xfe\xd3\xfd\xee" "\x4a\xaf\x01\x83\x30\xa1\x2a\xcd\xe0\xef" - "\xcc\x33\x8e\xb5\x29\x22\xf3\xe5\x71\x21" - "\x2d\x42\xc8\xde", + "\xcc\x33\x8e\xb5\x29\x22\xf3\xe5\x71\x21" "\x2d\x42\xc8\xde", 64 }; @@ -69,7 +65,6 @@ const gnutls_datum_t raw_data = { 5 }; - static void print_keys(gnutls_privkey_t privkey, gnutls_pubkey_t pubkey) { gnutls_x509_privkey_t xkey; @@ -96,7 +91,7 @@ static void print_keys(gnutls_privkey_t privkey, gnutls_pubkey_t pubkey) gnutls_x509_privkey_deinit(xkey); } -#define ERR fail("Failure at: %s (%s-%s) (iter: %d)\n", gnutls_sign_get_name(sign_algo), gnutls_pk_get_name(pk), gnutls_digest_get_name(hash), j); +# define ERR fail("Failure at: %s (%s-%s) (iter: %d)\n", gnutls_sign_get_name(sign_algo), gnutls_pk_get_name(pk), gnutls_digest_get_name(hash), j); static void test_sig(gnutls_pk_algorithm_t pk, unsigned hash, unsigned bits) { @@ -124,8 +119,7 @@ void test_sig(gnutls_pk_algorithm_t pk, unsigned hash, unsigned bits) else abort(); - sign_algo = - gnutls_pk_to_sign(pk, hash); + sign_algo = gnutls_pk_to_sign(pk, hash); for (j = 0; j < 100; j++) { ret = gnutls_pubkey_init(&pubkey); @@ -142,19 +136,21 @@ void test_sig(gnutls_pk_algorithm_t pk, unsigned hash, unsigned bits) ret = gnutls_privkey_sign_hash(privkey, hash, - 0, hash_data, - &signature); + 0, hash_data, &signature); if (ret < 0) ERR; - ret = gnutls_pubkey_import_privkey(pubkey, privkey, GNUTLS_KEY_DIGITAL_SIGNATURE, 0); + ret = + gnutls_pubkey_import_privkey(pubkey, privkey, + GNUTLS_KEY_DIGITAL_SIGNATURE, + 0); if (ret < 0) ERR; ret = gnutls_pubkey_verify_hash2(pubkey, - sign_algo, vflags, - hash_data, &signature); + sign_algo, vflags, + hash_data, &signature); if (ret < 0) { print_keys(privkey, pubkey); ERR; @@ -163,9 +159,8 @@ void test_sig(gnutls_pk_algorithm_t pk, unsigned hash, unsigned bits) /* should fail */ ret = gnutls_pubkey_verify_hash2(pubkey, - sign_algo, vflags, - &invalid_hash_data, - &signature); + sign_algo, vflags, + &invalid_hash_data, &signature); if (ret != GNUTLS_E_PK_SIG_VERIFY_FAILED) { print_keys(privkey, pubkey); ERR; @@ -177,15 +172,14 @@ void test_sig(gnutls_pk_algorithm_t pk, unsigned hash, unsigned bits) ret = gnutls_pubkey_verify_hash2(pubkey, sign_algo, vflags, - hash_data, &signature); + hash_data, &signature); if (ret < 0) ERR; /* should fail */ ret = gnutls_pubkey_verify_hash2(pubkey, sign_algo, vflags, - &invalid_hash_data, - &signature); + &invalid_hash_data, &signature); if (ret != GNUTLS_E_PK_SIG_VERIFY_FAILED) { print_keys(privkey, pubkey); ERR; @@ -200,8 +194,7 @@ void test_sig(gnutls_pk_algorithm_t pk, unsigned hash, unsigned bits) gnutls_privkey_sign_hash(privkey, hash, GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA, - hash_data, - &signature); + hash_data, &signature); if (ret < 0) ERR; @@ -212,10 +205,10 @@ void test_sig(gnutls_pk_algorithm_t pk, unsigned hash, unsigned bits) ret = gnutls_pubkey_verify_hash2(pubkey, - sign_algo, - vflags|GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RSA, - hash_data, - &signature); + sign_algo, + vflags | + GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RSA, + hash_data, &signature); if (ret < 0) { print_keys(privkey, pubkey); ERR; @@ -228,4 +221,4 @@ void test_sig(gnutls_pk_algorithm_t pk, unsigned hash, unsigned bits) } } -#endif /* GNUTLS_TESTS_X509SIGN_VERIFY_COMMON_H */ +#endif /* GNUTLS_TESTS_X509SIGN_VERIFY_COMMON_H */ |