diff options
Diffstat (limited to 'crypto/openssl/test/bio_pw_callback_test.c')
| -rw-r--r-- | crypto/openssl/test/bio_pw_callback_test.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/crypto/openssl/test/bio_pw_callback_test.c b/crypto/openssl/test/bio_pw_callback_test.c index e11368454a8c..0fb79238f911 100644 --- a/crypto/openssl/test/bio_pw_callback_test.c +++ b/crypto/openssl/test/bio_pw_callback_test.c @@ -63,7 +63,7 @@ const OPTIONS *test_get_options(void) static const OPTIONS test_options[] = { OPT_TEST_OPTIONS_DEFAULT_USAGE, { "keyfile", OPT_KEY_FILE, '<', - "The PEM file with the encrypted key to load" }, + "The PEM file with the encrypted key to load" }, { NULL } }; return test_options; @@ -152,7 +152,7 @@ err: } static int re_encrypt_key(char **enc_data, int *enc_data_size, - KEY_ENCODING key_encoding) + KEY_ENCODING key_encoding) { CALLBACK_DATA cb_data; int w_ret = 0; @@ -171,11 +171,11 @@ static int re_encrypt_key(char **enc_data, int *enc_data_size, switch (key_encoding) { case KE_PEM: w_ret = PEM_write_bio_PrivateKey(bio, original_pkey, EVP_aes_256_cbc(), - NULL, 0, write_callback, &cb_data); + NULL, 0, write_callback, &cb_data); break; case KE_PKCS8: w_ret = i2d_PKCS8PrivateKey_bio(bio, original_pkey, EVP_aes_256_cbc(), - NULL, 0, write_callback, &cb_data); + NULL, 0, write_callback, &cb_data); break; } if (!TEST_int_ne(w_ret, 0)) @@ -197,8 +197,8 @@ err: } static int decrypt_key(char *enc_data, int enc_data_size, - KEY_ENCODING key_encoding, - EXPECTED_RESULT expected_result) + KEY_ENCODING key_encoding, + EXPECTED_RESULT expected_result) { CALLBACK_DATA cb_data; EVP_PKEY *r_ret = NULL; @@ -237,8 +237,8 @@ err: } static int full_cycle_test(KEY_ENCODING key_encoding, CALLBACK_TEST write_test, - CALLBACK_TEST read_test, - EXPECTED_RESULT expected_read_result) + CALLBACK_TEST read_test, + EXPECTED_RESULT expected_read_result) { char *enc_data = NULL; int enc_data_size = 0; @@ -249,7 +249,7 @@ static int full_cycle_test(KEY_ENCODING key_encoding, CALLBACK_TEST write_test, goto err; callback_test = read_test; if (!decrypt_key(enc_data, enc_data_size, key_encoding, - expected_read_result)) + expected_read_result)) goto err; ret = 1; err: @@ -265,7 +265,7 @@ static int test_pem_negative(void) static int test_pem_zero_length(void) { return full_cycle_test(KE_PEM, CB_TEST_ZERO_LENGTH, CB_TEST_ZERO_LENGTH, - ER_SUCCESS); + ER_SUCCESS); } static int test_pem_weak(void) @@ -291,13 +291,13 @@ static int test_pem_a0a_a0b(void) static int test_pem_match_size(void) { return full_cycle_test(KE_PEM, CB_TEST_MATCH_SIZE, CB_TEST_MATCH_SIZE, - ER_SUCCESS); + ER_SUCCESS); } static int test_pem_exceed_size(void) { return full_cycle_test(KE_PEM, CB_TEST_MATCH_SIZE, CB_TEST_EXCEED_SIZE, - ER_FAILURE); + ER_FAILURE); } static int test_pkcs8_negative(void) @@ -308,7 +308,7 @@ static int test_pkcs8_negative(void) static int test_pkcs8_zero_length(void) { return full_cycle_test(KE_PKCS8, CB_TEST_ZERO_LENGTH, CB_TEST_ZERO_LENGTH, - ER_SUCCESS); + ER_SUCCESS); } static int test_pkcs8_weak(void) @@ -319,7 +319,7 @@ static int test_pkcs8_weak(void) static int test_pkcs8_16zero(void) { return full_cycle_test(KE_PKCS8, CB_TEST_16ZERO, CB_TEST_16ZERO, - ER_SUCCESS); + ER_SUCCESS); } static int test_pkcs8_a0a(void) @@ -335,13 +335,13 @@ static int test_pkcs8_a0a_a0b(void) static int test_pkcs8_match_size(void) { return full_cycle_test(KE_PKCS8, CB_TEST_MATCH_SIZE, CB_TEST_MATCH_SIZE, - ER_SUCCESS); + ER_SUCCESS); } static int test_pkcs8_exceed_size(void) { return full_cycle_test(KE_PKCS8, CB_TEST_MATCH_SIZE, CB_TEST_EXCEED_SIZE, - ER_FAILURE); + ER_FAILURE); } static int callback_original_pw(char *buf, int size, int rwflag, void *u) @@ -372,7 +372,7 @@ int setup_tests(void) if (!TEST_ptr(bio = BIO_new_file(key_file, "r"))) return 0; if (!TEST_ptr(PEM_read_bio_PrivateKey(bio, &original_pkey, - callback_original_pw, NULL))) + callback_original_pw, NULL))) return 0; BIO_free(bio); |