From deaa11a7c29a730087380da231e785909ad21630 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 10 Apr 2016 14:44:42 +0200 Subject: [PATCH] Improve format Don't align a function call continuation with spaces. I don't know why clang-format did this, but now it doesn't seem to do it anymore. --- .clang-format | 5 ++- srp.c | 27 ++++++------ test_srp.c | 113 +++++++++++++++++++++++++------------------------- 3 files changed, 71 insertions(+), 74 deletions(-) diff --git a/.clang-format b/.clang-format index 2689671..e732c60 100644 --- a/.clang-format +++ b/.clang-format @@ -1,11 +1,12 @@ --- BasedOnStyle: LLVM -IndentWidth: 8 +TabWidth: 4 +IndentWidth: 4 UseTab: Always IndentCaseLabels: false AllowShortIfStatementsOnASingleLine: true AlignAfterOpenBracket: false -ContinuationIndentWidth: 8 +ContinuationIndentWidth: 4 BreakBeforeBraces: Linux ColumnLimit: 90 AllowShortFunctionsOnASingleLine: None diff --git a/srp.c b/srp.c index 6c909bf..1b6880a 100644 --- a/srp.c +++ b/srp.c @@ -386,8 +386,8 @@ inline static void mpz_subm( mpz_mod(op, tmp, d); } -static SRP_Result H_nn(mpz_t result, SRP_HashAlgorithm alg, const mpz_t N, const mpz_t n1, - const mpz_t n2) +static SRP_Result H_nn( + mpz_t result, SRP_HashAlgorithm alg, const mpz_t N, const mpz_t n1, const mpz_t n2) { unsigned char buff[SHA512_DIGEST_LENGTH]; size_t len_N = mpz_num_bytes(N); @@ -527,8 +527,7 @@ static SRP_Result fill_buff() if (!CryptAcquireContext(&wctx, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) return SRP_ERR; - if (!CryptGenRandom(wctx, sizeof(g_rand_buff), (BYTE *)g_rand_buff)) - return SRP_ERR; + if (!CryptGenRandom(wctx, sizeof(g_rand_buff), (BYTE *)g_rand_buff)) return SRP_ERR; if (!CryptReleaseContext(wctx, 0)) return SRP_ERR; #else @@ -609,8 +608,8 @@ SRP_Result srp_create_salted_verification_key( SRP_HashAlgorithm alg, g_rand_idx += size_to_fill; } - if (!calculate_x(x, alg, *bytes_s, *len_s, username_for_verifier, password, - len_password)) + if (!calculate_x( + x, alg, *bytes_s, *len_s, username_for_verifier, password, len_password)) goto error_and_exit; srp_dbg_num(x, "Server calculated x: "); @@ -721,8 +720,8 @@ struct SRPVerifier *srp_verifier_new(SRP_HashAlgorithm alg, if (!hash_num(alg, S, ver->session_key)) goto ver_cleanup_and_exit; - if (!calculate_M(alg, ng, ver->M, username, bytes_s, len_s, A, B, - ver->session_key)) { + if (!calculate_M( + alg, ng, ver->M, username, bytes_s, len_s, A, B, ver->session_key)) { goto ver_cleanup_and_exit; } if (!calculate_H_AMK(alg, ver->H_AMK, A, ver->M, ver->session_key)) { @@ -971,7 +970,7 @@ void srp_user_process_challenge(struct SRPUser *usr, srp_dbg_num(u, "Client calculated u: "); if (!calculate_x(x, usr->hash_alg, bytes_s, len_s, usr->username_verifier, - usr->password, usr->password_len)) + usr->password, usr->password_len)) goto cleanup_and_exit; srp_dbg_num(x, "Client calculated x: "); @@ -995,14 +994,12 @@ void srp_user_process_challenge(struct SRPUser *usr, mpz_powm(usr->S, tmp1, tmp2, usr->ng->N); // clang-format on - if (!hash_num(usr->hash_alg, usr->S, usr->session_key)) - goto cleanup_and_exit; + if (!hash_num(usr->hash_alg, usr->S, usr->session_key)) goto cleanup_and_exit; - if (!calculate_M(usr->hash_alg, usr->ng, usr->M, usr->username, bytes_s, - len_s, usr->A, B, usr->session_key)) + if (!calculate_M(usr->hash_alg, usr->ng, usr->M, usr->username, bytes_s, len_s, + usr->A, B, usr->session_key)) goto cleanup_and_exit; - if (!calculate_H_AMK( - usr->hash_alg, usr->H_AMK, usr->A, usr->M, usr->session_key)) + if (!calculate_H_AMK(usr->hash_alg, usr->H_AMK, usr->A, usr->M, usr->session_key)) goto cleanup_and_exit; *bytes_M = usr->M; diff --git a/test_srp.c b/test_srp.c index 1c09955..0e73d0a 100644 --- a/test_srp.c +++ b/test_srp.c @@ -20,71 +20,71 @@ unsigned long long get_usec() // https://tools.ietf.org/html/rfc5054#appendix-B static const char srp_5054_salt[] = { - 0xBE, 0xB2, 0x53, 0x79, 0xD1, 0xA8, 0x58, 0x1E, 0xB5, 0xA7, 0x27, 0x67, 0x3A, - 0x24, 0x41, 0xEE, + 0xBE, 0xB2, 0x53, 0x79, 0xD1, 0xA8, 0x58, 0x1E, 0xB5, 0xA7, 0x27, 0x67, 0x3A, 0x24, + 0x41, 0xEE, }; static const char srp_5054_v[] = { - 0x7E, 0x27, 0x3D, 0xE8, 0x69, 0x6F, 0xFC, 0x4F, 0x4E, 0x33, 0x7D, 0x05, 0xB4, - 0xB3, 0x75, 0xBE, 0xB0, 0xDD, 0xE1, 0x56, 0x9E, 0x8F, 0xA0, 0x0A, 0x98, 0x86, - 0xD8, 0x12, 0x9B, 0xAD, 0xA1, 0xF1, 0x82, 0x22, 0x23, 0xCA, 0x1A, 0x60, 0x5B, - 0x53, 0x0E, 0x37, 0x9B, 0xA4, 0x72, 0x9F, 0xDC, 0x59, 0xF1, 0x05, 0xB4, 0x78, - 0x7E, 0x51, 0x86, 0xF5, 0xC6, 0x71, 0x08, 0x5A, 0x14, 0x47, 0xB5, 0x2A, 0x48, - 0xCF, 0x19, 0x70, 0xB4, 0xFB, 0x6F, 0x84, 0x00, 0xBB, 0xF4, 0xCE, 0xBF, 0xBB, - 0x16, 0x81, 0x52, 0xE0, 0x8A, 0xB5, 0xEA, 0x53, 0xD1, 0x5C, 0x1A, 0xFF, 0x87, - 0xB2, 0xB9, 0xDA, 0x6E, 0x04, 0xE0, 0x58, 0xAD, 0x51, 0xCC, 0x72, 0xBF, 0xC9, - 0x03, 0x3B, 0x56, 0x4E, 0x26, 0x48, 0x0D, 0x78, 0xE9, 0x55, 0xA5, 0xE2, 0x9E, - 0x7A, 0xB2, 0x45, 0xDB, 0x2B, 0xE3, 0x15, 0xE2, 0x09, 0x9A, 0xFB, + 0x7E, 0x27, 0x3D, 0xE8, 0x69, 0x6F, 0xFC, 0x4F, 0x4E, 0x33, 0x7D, 0x05, 0xB4, 0xB3, + 0x75, 0xBE, 0xB0, 0xDD, 0xE1, 0x56, 0x9E, 0x8F, 0xA0, 0x0A, 0x98, 0x86, 0xD8, 0x12, + 0x9B, 0xAD, 0xA1, 0xF1, 0x82, 0x22, 0x23, 0xCA, 0x1A, 0x60, 0x5B, 0x53, 0x0E, 0x37, + 0x9B, 0xA4, 0x72, 0x9F, 0xDC, 0x59, 0xF1, 0x05, 0xB4, 0x78, 0x7E, 0x51, 0x86, 0xF5, + 0xC6, 0x71, 0x08, 0x5A, 0x14, 0x47, 0xB5, 0x2A, 0x48, 0xCF, 0x19, 0x70, 0xB4, 0xFB, + 0x6F, 0x84, 0x00, 0xBB, 0xF4, 0xCE, 0xBF, 0xBB, 0x16, 0x81, 0x52, 0xE0, 0x8A, 0xB5, + 0xEA, 0x53, 0xD1, 0x5C, 0x1A, 0xFF, 0x87, 0xB2, 0xB9, 0xDA, 0x6E, 0x04, 0xE0, 0x58, + 0xAD, 0x51, 0xCC, 0x72, 0xBF, 0xC9, 0x03, 0x3B, 0x56, 0x4E, 0x26, 0x48, 0x0D, 0x78, + 0xE9, 0x55, 0xA5, 0xE2, 0x9E, 0x7A, 0xB2, 0x45, 0xDB, 0x2B, 0xE3, 0x15, 0xE2, 0x09, + 0x9A, 0xFB, }; static const char srp_5054_a[] = { - 0x60, 0x97, 0x55, 0x27, 0x03, 0x5C, 0xF2, 0xAD, 0x19, 0x89, 0x80, 0x6F, 0x04, - 0x07, 0x21, 0x0B, 0xC8, 0x1E, 0xDC, 0x04, 0xE2, 0x76, 0x2A, 0x56, 0xAF, 0xD5, - 0x29, 0xDD, 0xDA, 0x2D, 0x43, 0x93, + 0x60, 0x97, 0x55, 0x27, 0x03, 0x5C, 0xF2, 0xAD, 0x19, 0x89, 0x80, 0x6F, 0x04, 0x07, + 0x21, 0x0B, 0xC8, 0x1E, 0xDC, 0x04, 0xE2, 0x76, 0x2A, 0x56, 0xAF, 0xD5, 0x29, 0xDD, + 0xDA, 0x2D, 0x43, 0x93, }; static const char srp_5054_A[] = { - 0x61, 0xD5, 0xE4, 0x90, 0xF6, 0xF1, 0xB7, 0x95, 0x47, 0xB0, 0x70, 0x4C, 0x43, - 0x6F, 0x52, 0x3D, 0xD0, 0xE5, 0x60, 0xF0, 0xC6, 0x41, 0x15, 0xBB, 0x72, 0x55, - 0x7E, 0xC4, 0x43, 0x52, 0xE8, 0x90, 0x32, 0x11, 0xC0, 0x46, 0x92, 0x27, 0x2D, - 0x8B, 0x2D, 0x1A, 0x53, 0x58, 0xA2, 0xCF, 0x1B, 0x6E, 0x0B, 0xFC, 0xF9, 0x9F, - 0x92, 0x15, 0x30, 0xEC, 0x8E, 0x39, 0x35, 0x61, 0x79, 0xEA, 0xE4, 0x5E, 0x42, - 0xBA, 0x92, 0xAE, 0xAC, 0xED, 0x82, 0x51, 0x71, 0xE1, 0xE8, 0xB9, 0xAF, 0x6D, - 0x9C, 0x03, 0xE1, 0x32, 0x7F, 0x44, 0xBE, 0x08, 0x7E, 0xF0, 0x65, 0x30, 0xE6, - 0x9F, 0x66, 0x61, 0x52, 0x61, 0xEE, 0xF5, 0x40, 0x73, 0xCA, 0x11, 0xCF, 0x58, - 0x58, 0xF0, 0xED, 0xFD, 0xFE, 0x15, 0xEF, 0xEA, 0xB3, 0x49, 0xEF, 0x5D, 0x76, - 0x98, 0x8A, 0x36, 0x72, 0xFA, 0xC4, 0x7B, 0x07, 0x69, 0x44, 0x7B, + 0x61, 0xD5, 0xE4, 0x90, 0xF6, 0xF1, 0xB7, 0x95, 0x47, 0xB0, 0x70, 0x4C, 0x43, 0x6F, + 0x52, 0x3D, 0xD0, 0xE5, 0x60, 0xF0, 0xC6, 0x41, 0x15, 0xBB, 0x72, 0x55, 0x7E, 0xC4, + 0x43, 0x52, 0xE8, 0x90, 0x32, 0x11, 0xC0, 0x46, 0x92, 0x27, 0x2D, 0x8B, 0x2D, 0x1A, + 0x53, 0x58, 0xA2, 0xCF, 0x1B, 0x6E, 0x0B, 0xFC, 0xF9, 0x9F, 0x92, 0x15, 0x30, 0xEC, + 0x8E, 0x39, 0x35, 0x61, 0x79, 0xEA, 0xE4, 0x5E, 0x42, 0xBA, 0x92, 0xAE, 0xAC, 0xED, + 0x82, 0x51, 0x71, 0xE1, 0xE8, 0xB9, 0xAF, 0x6D, 0x9C, 0x03, 0xE1, 0x32, 0x7F, 0x44, + 0xBE, 0x08, 0x7E, 0xF0, 0x65, 0x30, 0xE6, 0x9F, 0x66, 0x61, 0x52, 0x61, 0xEE, 0xF5, + 0x40, 0x73, 0xCA, 0x11, 0xCF, 0x58, 0x58, 0xF0, 0xED, 0xFD, 0xFE, 0x15, 0xEF, 0xEA, + 0xB3, 0x49, 0xEF, 0x5D, 0x76, 0x98, 0x8A, 0x36, 0x72, 0xFA, 0xC4, 0x7B, 0x07, 0x69, + 0x44, 0x7B, }; static const char srp_5054_b[] = { - 0xE4, 0x87, 0xCB, 0x59, 0xD3, 0x1A, 0xC5, 0x50, 0x47, 0x1E, 0x81, 0xF0, 0x0F, - 0x69, 0x28, 0xE0, 0x1D, 0xDA, 0x08, 0xE9, 0x74, 0xA0, 0x04, 0xF4, 0x9E, 0x61, - 0xF5, 0xD1, 0x05, 0x28, 0x4D, 0x20, + 0xE4, 0x87, 0xCB, 0x59, 0xD3, 0x1A, 0xC5, 0x50, 0x47, 0x1E, 0x81, 0xF0, 0x0F, 0x69, + 0x28, 0xE0, 0x1D, 0xDA, 0x08, 0xE9, 0x74, 0xA0, 0x04, 0xF4, 0x9E, 0x61, 0xF5, 0xD1, + 0x05, 0x28, 0x4D, 0x20, }; static const char srp_5054_B[] = { - 0xBD, 0x0C, 0x61, 0x51, 0x2C, 0x69, 0x2C, 0x0C, 0xB6, 0xD0, 0x41, 0xFA, 0x01, - 0xBB, 0x15, 0x2D, 0x49, 0x16, 0xA1, 0xE7, 0x7A, 0xF4, 0x6A, 0xE1, 0x05, 0x39, - 0x30, 0x11, 0xBA, 0xF3, 0x89, 0x64, 0xDC, 0x46, 0xA0, 0x67, 0x0D, 0xD1, 0x25, - 0xB9, 0x5A, 0x98, 0x16, 0x52, 0x23, 0x6F, 0x99, 0xD9, 0xB6, 0x81, 0xCB, 0xF8, - 0x78, 0x37, 0xEC, 0x99, 0x6C, 0x6D, 0xA0, 0x44, 0x53, 0x72, 0x86, 0x10, 0xD0, - 0xC6, 0xDD, 0xB5, 0x8B, 0x31, 0x88, 0x85, 0xD7, 0xD8, 0x2C, 0x7F, 0x8D, 0xEB, - 0x75, 0xCE, 0x7B, 0xD4, 0xFB, 0xAA, 0x37, 0x08, 0x9E, 0x6F, 0x9C, 0x60, 0x59, - 0xF3, 0x88, 0x83, 0x8E, 0x7A, 0x00, 0x03, 0x0B, 0x33, 0x1E, 0xB7, 0x68, 0x40, - 0x91, 0x04, 0x40, 0xB1, 0xB2, 0x7A, 0xAE, 0xAE, 0xEB, 0x40, 0x12, 0xB7, 0xD7, - 0x66, 0x52, 0x38, 0xA8, 0xE3, 0xFB, 0x00, 0x4B, 0x11, 0x7B, 0x58, + 0xBD, 0x0C, 0x61, 0x51, 0x2C, 0x69, 0x2C, 0x0C, 0xB6, 0xD0, 0x41, 0xFA, 0x01, 0xBB, + 0x15, 0x2D, 0x49, 0x16, 0xA1, 0xE7, 0x7A, 0xF4, 0x6A, 0xE1, 0x05, 0x39, 0x30, 0x11, + 0xBA, 0xF3, 0x89, 0x64, 0xDC, 0x46, 0xA0, 0x67, 0x0D, 0xD1, 0x25, 0xB9, 0x5A, 0x98, + 0x16, 0x52, 0x23, 0x6F, 0x99, 0xD9, 0xB6, 0x81, 0xCB, 0xF8, 0x78, 0x37, 0xEC, 0x99, + 0x6C, 0x6D, 0xA0, 0x44, 0x53, 0x72, 0x86, 0x10, 0xD0, 0xC6, 0xDD, 0xB5, 0x8B, 0x31, + 0x88, 0x85, 0xD7, 0xD8, 0x2C, 0x7F, 0x8D, 0xEB, 0x75, 0xCE, 0x7B, 0xD4, 0xFB, 0xAA, + 0x37, 0x08, 0x9E, 0x6F, 0x9C, 0x60, 0x59, 0xF3, 0x88, 0x83, 0x8E, 0x7A, 0x00, 0x03, + 0x0B, 0x33, 0x1E, 0xB7, 0x68, 0x40, 0x91, 0x04, 0x40, 0xB1, 0xB2, 0x7A, 0xAE, 0xAE, + 0xEB, 0x40, 0x12, 0xB7, 0xD7, 0x66, 0x52, 0x38, 0xA8, 0xE3, 0xFB, 0x00, 0x4B, 0x11, + 0x7B, 0x58, }; // This isn't used (yet) static const char srp_5054_u[] = { - 0xCE, 0x38, 0xB9, 0x59, 0x34, 0x87, 0xDA, 0x98, 0x55, 0x4E, 0xD4, 0x7D, 0x70, - 0xA7, 0xAE, 0x5F, 0x46, 0x2E, 0xF0, 0x19, + 0xCE, 0x38, 0xB9, 0x59, 0x34, 0x87, 0xDA, 0x98, 0x55, 0x4E, 0xD4, 0x7D, 0x70, 0xA7, + 0xAE, 0x5F, 0x46, 0x2E, 0xF0, 0x19, }; // This is SHA-1() static const char srp_5054_S[] = { - 0x01, 0x7e, 0xef, 0xa1, 0xce, 0xfc, 0x5c, 0x2e, 0x62, 0x6e, 0x21, 0x59, 0x89, - 0x87, 0xf3, 0x1e, 0x0f, 0x1b, 0x11, 0xbb, + 0x01, 0x7e, 0xef, 0xa1, 0xce, 0xfc, 0x5c, 0x2e, 0x62, 0x6e, 0x21, 0x59, 0x89, 0x87, + 0xf3, 0x1e, 0x0f, 0x1b, 0x11, 0xbb, }; int test_rfc_5054_compat() @@ -119,16 +119,16 @@ int test_rfc_5054_compat() printf("Testing RFC 5054 test vectors..."); srp_create_salted_verification_key(alg, ng_type, username, - (const unsigned char *)password, strlen(password), &bytes_s, &len_s, - &bytes_v, &len_v, NULL, NULL); + (const unsigned char *)password, strlen(password), &bytes_s, &len_s, &bytes_v, + &len_v, NULL, NULL); if (len_v != 128 || memcmp(&srp_5054_v, bytes_v, len_v) != 0) { printf(" computed v doesn't match!\n"); return 1; } - usr = srp_user_new(alg, ng_type, username, username, - (const unsigned char *)password, strlen(password), NULL, NULL); + usr = srp_user_new(alg, ng_type, username, username, (const unsigned char *)password, + strlen(password), NULL, NULL); srp_user_start_authentication( usr, NULL, (unsigned char *)srp_5054_a, 32, &bytes_A, &len_A); @@ -139,9 +139,9 @@ int test_rfc_5054_compat() } /* User -> Host: (username, bytes_A) */ - ver = srp_verifier_new(alg, ng_type, username, (unsigned char *)srp_5054_salt, - len_s, bytes_v, len_v, bytes_A, len_A, (unsigned char *)srp_5054_b, 32, - &bytes_B, &len_B, NULL, NULL); + ver = srp_verifier_new(alg, ng_type, username, (unsigned char *)srp_5054_salt, len_s, + bytes_v, len_v, bytes_A, len_A, (unsigned char *)srp_5054_b, 32, &bytes_B, &len_B, + NULL, NULL); if (!bytes_B) { printf(" SRP-6a safety check violated for B!\n"); @@ -154,8 +154,8 @@ int test_rfc_5054_compat() } /* Host -> User: (bytes_s, bytes_B) */ - srp_user_process_challenge(usr, (unsigned char *)srp_5054_salt, len_s, bytes_B, - len_B, &bytes_M, &len_M); + srp_user_process_challenge( + usr, (unsigned char *)srp_5054_salt, len_s, bytes_B, len_B, &bytes_M, &len_M); if (!bytes_M) { printf(" SRP-6a safety check violated for M!\n"); @@ -245,8 +245,8 @@ int main(int argc, char *argv[]) } if (srp_create_salted_verification_key(alg, ng_type, ver_unam, - (const unsigned char *)password, strlen(password), &bytes_s, &len_s, - &bytes_v, &len_v, n_hex, g_hex) != SRP_OK) + (const unsigned char *)password, strlen(password), &bytes_s, &len_s, &bytes_v, + &len_v, n_hex, g_hex) != SRP_OK) return 1; start = get_usec(); @@ -262,8 +262,8 @@ int main(int argc, char *argv[]) } /* User -> Host: (username, bytes_A) */ - ver = srp_verifier_new(alg, ng_type, username, bytes_s, len_s, bytes_v, - len_v, bytes_A, len_A, NULL, 0, &bytes_B, &len_B, n_hex, g_hex); + ver = srp_verifier_new(alg, ng_type, username, bytes_s, len_s, bytes_v, len_v, + bytes_A, len_A, NULL, 0, &bytes_B, &len_B, n_hex, g_hex); if (!bytes_B) { printf("Verifier SRP-6a safety check violated!\n"); @@ -271,8 +271,7 @@ int main(int argc, char *argv[]) } /* Host -> User: (bytes_s, bytes_B) */ - srp_user_process_challenge( - usr, bytes_s, len_s, bytes_B, len_B, &bytes_M, &len_M); + srp_user_process_challenge(usr, bytes_s, len_s, bytes_B, len_B, &bytes_M, &len_M); if (!bytes_M) { printf("User SRP-6a safety check violation!\n");