ports/libssh
ports/libssh
1
1
Форкнуть 0
Код Релизы 1 Активность

tests: Use SSH_STRING_FREE_CHAR

Просмотр исходного кода 
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Этот коммит содержится в:
Anderson Toshiyuki Sasaki 2018-09-24 18:24:53 +02:00 коммит произвёл Andreas Schneider
родитель 11d480134c
Коммит 143b5e2e50
6 изменённых файлов: 36 добавлений и 33 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
tests/unittests/torture_config.c
Просмотреть файл

@ -170,21 +170,21 @@ static void torture_config_from_file(void **state) {
assert_non_null(v); assert_non_null(v);
assert_string_equal(v, PROXYCMD); assert_string_equal(v, PROXYCMD);
ssh_string_free_char(v); SSH_STRING_FREE_CHAR(v);
ret = ssh_options_get(session, SSH_OPTIONS_IDENTITY, &v); ret = ssh_options_get(session, SSH_OPTIONS_IDENTITY, &v);
assert_true(ret == 0); assert_true(ret == 0);
assert_non_null(v); assert_non_null(v);
assert_string_equal(v, ID_FILE); assert_string_equal(v, ID_FILE);
ssh_string_free_char(v); SSH_STRING_FREE_CHAR(v);
ret = ssh_options_get(session, SSH_OPTIONS_USER, &v); ret = ssh_options_get(session, SSH_OPTIONS_USER, &v);
assert_true(ret == 0); assert_true(ret == 0);
assert_non_null(v); assert_non_null(v);
assert_string_equal(v, USERNAME); assert_string_equal(v, USERNAME);
ssh_string_free_char(v); SSH_STRING_FREE_CHAR(v);
assert_string_equal(session->opts.wanted_methods[SSH_KEX], KEXALGORITHMS); assert_string_equal(session->opts.wanted_methods[SSH_KEX], KEXALGORITHMS);
@ -223,14 +223,14 @@ static void torture_config_glob(void **state) {
assert_non_null(v); assert_non_null(v);
assert_string_equal(v, PROXYCMD); assert_string_equal(v, PROXYCMD);
ssh_string_free_char(v); SSH_STRING_FREE_CHAR(v);
ret = ssh_options_get(session, SSH_OPTIONS_IDENTITY, &v); ret = ssh_options_get(session, SSH_OPTIONS_IDENTITY, &v);
assert_true(ret == 0); assert_true(ret == 0);
assert_non_null(v); assert_non_null(v);
assert_string_equal(v, ID_FILE); assert_string_equal(v, ID_FILE);
ssh_string_free_char(v); SSH_STRING_FREE_CHAR(v);
#endif /* HAVE_GLOB */ #endif /* HAVE_GLOB */
} }

43
tests/unittests/torture_hashes.c
Просмотреть файл

@ -48,81 +48,84 @@ static int teardown(void **state)
static void torture_md5_hash(void **state) static void torture_md5_hash(void **state)
{ {
ssh_key pubkey = *state; ssh_key pubkey = *state;
unsigned char *hash = NULL; char *hash = NULL;
char *hexa = NULL; char *hexa = NULL;
size_t hlen; size_t hlen;
int rc = 0; int rc = 0;
rc = ssh_get_publickey_hash(pubkey, SSH_PUBLICKEY_HASH_MD5, &hash, &hlen); rc = ssh_get_publickey_hash(pubkey, SSH_PUBLICKEY_HASH_MD5,
(unsigned char **)&hash, &hlen);
assert_true(rc == 0); assert_true(rc == 0);
hexa = ssh_get_hexa(hash, hlen); hexa = ssh_get_hexa((unsigned char *)hash, hlen);
ssh_string_free_char((char *)hash); SSH_STRING_FREE_CHAR(hash);
assert_string_equal(hexa, assert_string_equal(hexa,
"50:15:a0:9b:92:bf:33:1c:01:c5:8c:fe:18:fa:ce:78"); "50:15:a0:9b:92:bf:33:1c:01:c5:8c:fe:18:fa:ce:78");
ssh_string_free_char(hexa); SSH_STRING_FREE_CHAR(hexa);
} }
static void torture_sha1_hash(void **state) static void torture_sha1_hash(void **state)
{ {
ssh_key pubkey = *state; ssh_key pubkey = *state;
unsigned char *hash = NULL; char *hash = NULL;
char *sha1 = NULL; char *sha1 = NULL;
int rc = 0; int rc = 0;
size_t hlen; size_t hlen;
rc = ssh_get_publickey_hash(pubkey, SSH_PUBLICKEY_HASH_SHA1, &hash, &hlen); rc = ssh_get_publickey_hash(pubkey, SSH_PUBLICKEY_HASH_SHA1,
(unsigned char **)&hash, &hlen);
assert_true(rc == 0); assert_true(rc == 0);
sha1 = ssh_get_b64_unpadded(hash, hlen); sha1 = ssh_get_b64_unpadded((unsigned char *)hash, hlen);
ssh_string_free_char((char *)hash); SSH_STRING_FREE_CHAR(hash);
assert_string_equal(sha1, "6wP+houujQmxLBiFugTcoeoODCM"); assert_string_equal(sha1, "6wP+houujQmxLBiFugTcoeoODCM");
ssh_string_free_char(sha1); SSH_STRING_FREE_CHAR(sha1);
} }
static void torture_sha256_hash(void **state) static void torture_sha256_hash(void **state)
{ {
ssh_key pubkey = *state; ssh_key pubkey = *state;
unsigned char *hash = NULL; char *hash = NULL;
char *sha256 = NULL; char *sha256 = NULL;
int rc = 0; int rc = 0;
size_t hlen; size_t hlen;
rc = ssh_get_publickey_hash(pubkey, SSH_PUBLICKEY_HASH_SHA256, &hash, &hlen); rc = ssh_get_publickey_hash(pubkey, SSH_PUBLICKEY_HASH_SHA256,
(unsigned char **)&hash, &hlen);
assert_true(rc == 0); assert_true(rc == 0);
sha256 = ssh_get_b64_unpadded(hash, hlen); sha256 = ssh_get_b64_unpadded((unsigned char *)hash, hlen);
ssh_string_free_char((char *)hash); SSH_STRING_FREE_CHAR(hash);
assert_string_equal(sha256, "jXstVLLe84fSDo1kEYGn6iumnPCSorhaiWxnJz8VTII"); assert_string_equal(sha256, "jXstVLLe84fSDo1kEYGn6iumnPCSorhaiWxnJz8VTII");
ssh_string_free_char(sha256); SSH_STRING_FREE_CHAR(sha256);
} }
static void torture_sha256_fingerprint(void **state) static void torture_sha256_fingerprint(void **state)
{ {
ssh_key pubkey = *state; ssh_key pubkey = *state;
unsigned char *hash = NULL; char *hash = NULL;
char *sha256 = NULL; char *sha256 = NULL;
int rc = 0; int rc = 0;
size_t hlen; size_t hlen;
rc = ssh_get_publickey_hash(pubkey, rc = ssh_get_publickey_hash(pubkey,
SSH_PUBLICKEY_HASH_SHA256, SSH_PUBLICKEY_HASH_SHA256,
&hash, (unsigned char **)&hash,
&hlen); &hlen);
assert_true(rc == 0); assert_true(rc == 0);
sha256 = ssh_get_fingerprint_hash(SSH_PUBLICKEY_HASH_SHA256, sha256 = ssh_get_fingerprint_hash(SSH_PUBLICKEY_HASH_SHA256,
hash, (unsigned char *)hash,
hlen); hlen);
ssh_string_free_char(discard_const(hash)); SSH_STRING_FREE_CHAR(hash);
assert_string_equal(sha256, assert_string_equal(sha256,
"SHA256:jXstVLLe84fSDo1kEYGn6iumnPCSorhaiWxnJz8VTII"); "SHA256:jXstVLLe84fSDo1kEYGn6iumnPCSorhaiWxnJz8VTII");
ssh_string_free_char(sha256); SSH_STRING_FREE_CHAR(sha256);
} }
int torture_run_tests(void) { int torture_run_tests(void) {

4
tests/unittests/torture_pki_dsa.c
Просмотреть файл

@ -533,8 +533,8 @@ static void torture_pki_dsa_duplicate_key(void **state)
ssh_key_free(pubkey); ssh_key_free(pubkey);
ssh_key_free(privkey); ssh_key_free(privkey);
ssh_key_free(privkey_dup); ssh_key_free(privkey_dup);
ssh_string_free_char(b64_key); SSH_STRING_FREE_CHAR(b64_key);
ssh_string_free_char(b64_key_gen); SSH_STRING_FREE_CHAR(b64_key_gen);
} }
static void torture_pki_dsa_generate_key(void **state) static void torture_pki_dsa_generate_key(void **state)

4
tests/unittests/torture_pki_ecdsa.c
Просмотреть файл

@ -310,8 +310,8 @@ static void torture_pki_ecdsa_duplicate_key(void **state)
ssh_key_free(pubkey); ssh_key_free(pubkey);
ssh_key_free(privkey); ssh_key_free(privkey);
ssh_key_free(privkey_dup); ssh_key_free(privkey_dup);
ssh_string_free_char(b64_key); SSH_STRING_FREE_CHAR(b64_key);
ssh_string_free_char(b64_key_gen); SSH_STRING_FREE_CHAR(b64_key_gen);
} }
/* Test case for bug #147: Private ECDSA key duplication did not carry /* Test case for bug #147: Private ECDSA key duplication did not carry

4
tests/unittests/torture_pki_rsa.c
Просмотреть файл

@ -385,8 +385,8 @@ static void torture_pki_rsa_duplicate_key(void **state)
ssh_key_free(pubkey); ssh_key_free(pubkey);
ssh_key_free(privkey); ssh_key_free(privkey);
ssh_key_free(privkey_dup); ssh_key_free(privkey_dup);
ssh_string_free_char(b64_key); SSH_STRING_FREE_CHAR(b64_key);
ssh_string_free_char(b64_key_gen); SSH_STRING_FREE_CHAR(b64_key_gen);
} }
static void torture_pki_rsa_generate_key(void **state) static void torture_pki_rsa_generate_key(void **state)

4
tests/unittests/torture_threads_pki_rsa.c
Просмотреть файл

@ -492,8 +492,8 @@ static void *thread_pki_rsa_duplicate_key(void *threadid)
ssh_key_free(pubkey); ssh_key_free(pubkey);
ssh_key_free(privkey); ssh_key_free(privkey);
ssh_key_free(privkey_dup); ssh_key_free(privkey_dup);
ssh_string_free_char(b64_key); SSH_STRING_FREE_CHAR(b64_key);
ssh_string_free_char(b64_key_gen); SSH_STRING_FREE_CHAR(b64_key_gen);
pthread_exit(NULL); pthread_exit(NULL);
} }