zzy/openssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor Password Variables to Use const char[] Arrays

Browse Source 
- Converted password declaration from `char*` to `const char[]`.
- Updated `memcpy` and `return` statements accordingly to use `sizeof` instead of predefined lengths.
- Renamed `key_password` into `weak_password` to match test name.

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25330)
This commit is contained in:
erbsland-dev 2024-09-01 22:55:12 +02:00 committed by Tomas Mraz
parent 9808ccc53f
commit d52e92f835
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/bio_pw_callback_test.c
View File

@ -19,13 +19,10 @@ typedef struct CallbackData {
} CALLBACK_DATA; } CALLBACK_DATA;
/* constants */ /* constants */
static char *key_password = "weak_password"; static const char weak_password[] = "weak_password";
static int key_password_len = 13; static const char a0a_password[] = "aaaaaaaa\0aaaaaaaa";
static char *a0a_password = "aaaaaaaa\0aaaaaaaa"; static const char a0b_password[] = "aaaaaaaa\0bbbbbbbb";
static int a0a_password_len = 17; static const char cb_magic = 'p';
static char *a0b_password = "aaaaaaaa\0bbbbbbbb";
static int a0b_password_len = 17;
static char cb_magic = 'p';
/* shared working data for all tests */ /* shared working data for all tests */
static char *key_file = NULL; static char *key_file = NULL;
@ -83,20 +80,20 @@ static int callback_copy_password(char *buf, int size)
ret = 0; ret = 0;
break; break;
case CB_TEST_WEAK: case CB_TEST_WEAK:
memcpy(buf, key_password, key_password_len); ret = sizeof(weak_password) - 1;
ret = key_password_len; memcpy(buf, weak_password, ret);
break; break;
case CB_TEST_16ZERO: case CB_TEST_16ZERO:
memset(buf, 0, 16); memset(buf, 0, 16);
ret = 16; ret = 16;
break; break;
case CB_TEST_A0A: case CB_TEST_A0A:
memcpy(buf, a0a_password, a0a_password_len); ret = sizeof(a0a_password) - 1;
ret = a0a_password_len; memcpy(buf, a0a_password, ret);
break; break;
case CB_TEST_A0B: case CB_TEST_A0B:
memcpy(buf, a0b_password, a0b_password_len); ret = sizeof(a0b_password) - 1;
ret = a0b_password_len; memcpy(buf, a0b_password, ret);
break; break;
case CB_TEST_MATCH_SIZE: case CB_TEST_MATCH_SIZE:
memset(buf, 'e', size); memset(buf, 'e', size);
@ -349,8 +346,8 @@ static int test_pkcs8_exceed_size(void)
static int callback_original_pw(char *buf, int size, int rwflag, void *u) static int callback_original_pw(char *buf, int size, int rwflag, void *u)
{ {
memcpy(buf, key_password, key_password_len); memcpy(buf, weak_password, sizeof(weak_password) - 1);
return key_password_len; return sizeof(weak_password) - 1;
} }
int setup_tests(void) int setup_tests(void)