shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-04 12:20:42 +09:00
Code Issues Packages Projects Releases Wiki Activity

tests: Move helper functions to a common file

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2018-01-08 21:47:56 +01:00
parent e19163eabb
commit fd2ef07f37
4 changed files with 101 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CMakeLists.txt
View File

@@ -30,7 +30,7 @@ if (LIBSSH_THREADS)
endif (LIBSSH_THREADS)
# create test library
add_library(${TORTURE_LIBRARY} STATIC cmdline.c torture.c)
add_library(${TORTURE_LIBRARY} STATIC cmdline.c torture.c torture_pki.c)
target_link_libraries(${TORTURE_LIBRARY}
${TORTURE_LINK_LIBRARIES}
)

91
tests/torture_pki.c Normal file
View File

@@ -0,0 +1,91 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include "torture_pki.h"
char *torture_pki_read_file(const char *filename)
{
char *key;
int fd;
int size;
int rc;
struct stat sb;
if (filename == NULL || filename[0] == '\0') {
return NULL;
}
fd = open(filename, O_RDONLY);
if (fd < 0) {
return NULL;
}
rc = fstat(fd, &sb);
if (rc != 0) {
close(fd);
return NULL;
}
key = malloc(sb.st_size + 1);
if (key == NULL) {
close(fd);
return NULL;
}
size = read(fd, key, sb.st_size);
close(fd);
if (size != sb.st_size) {
free(key);
return NULL;
}
key[size] = '\0';
return key;
}
int torture_read_one_line(const char *filename, char *buffer, size_t len)
{
FILE *fp;
size_t nmemb;
fp = fopen(filename, "r");
if (fp == NULL) {
return -1;
}
nmemb = fread(buffer, len - 2, 1, fp);
if (nmemb != 0 || ferror(fp)) {
fclose(fp);
return -1;
}
buffer[len - 1] = '\0';
fclose(fp);
return 0;
}
/**
* @internal
*
* Returns the character len of a public key string, omitting the comment part
*/
size_t torture_pubkey_len(const char *pubkey)
{
const char *ptr;
ptr = strchr(pubkey, ' ');
if (ptr != NULL) {
ptr = strchr(ptr + 1, ' ');
if (ptr != NULL) {
return ptr - pubkey;
}
}
return 0;
}

3
tests/torture_pki.h Normal file
View File

@@ -0,0 +1,3 @@
char *torture_pki_read_file(const char *filename);
int torture_read_one_line(const char *filename, char *buffer, size_t len);
size_t torture_pubkey_len(const char *pubkey);

75
tests/unittests/torture_pki.c
View File

@@ -3,6 +3,7 @@
#define LIBSSH_STATIC
#include "torture.h"
#include "torture_pki.h"
#include "pki.c"
#include <sys/stat.h>
#include <fcntl.h>
@@ -133,70 +134,6 @@ static int teardown(void **state) {
return 0;
}
static char *read_file(const char *filename) {
char *key;
int fd;
int size;
int rc;
struct stat sb;
assert_true(filename != NULL);
assert_true(*filename != '\0');
fd = open(filename, O_RDONLY);
assert_true(fd >= 0);
rc = fstat(fd, &sb);
assert_int_equal(rc, 0);
key = malloc(sb.st_size + 1);
assert_true(key != NULL);
size = read(fd, key, sb.st_size);
assert_true(size == sb.st_size);
close(fd);
key[size] = '\0';
return key;
}
static int torture_read_one_line(const char *filename, char *buffer, size_t len) {
FILE *fp;
size_t nmemb;
fp = fopen(filename, "r");
if (fp == NULL) {
return -1;
}
nmemb = fread(buffer, len - 2, 1, fp);
if (nmemb != 0 || ferror(fp)) {
fclose(fp);
return -1;
}
buffer[len - 1] = '\0';
fclose(fp);
return 0;
}
/** @internal
* returns the character len of a public key string, omitting the comment part
*/
static int torture_pubkey_len(const char *pubkey){
const char *ptr;
ptr=strchr(pubkey, ' ');
if (ptr != NULL){
ptr = strchr(ptr + 1, ' ');
if (ptr != NULL){
return ptr - pubkey;
}
}
return 0;
}
static void torture_pki_keytype(void **state) {
enum ssh_keytypes_e type;
const char *type_c;
@@ -240,7 +177,7 @@ static void torture_pki_import_privkey_base64_RSA(void **state) {
(void) state; /* unused */
key_str = read_file(LIBSSH_RSA_TESTKEY);
key_str = torture_pki_read_file(LIBSSH_RSA_TESTKEY);
assert_true(key_str != NULL);
rc = ssh_pki_import_privkey_base64(key_str, passphrase, NULL, NULL, &key);
@@ -317,7 +254,7 @@ static void torture_pki_import_privkey_base64_ECDSA(void **state) {
(void) state; /* unused */
key_str = read_file(LIBSSH_ECDSA_TESTKEY);
key_str = torture_pki_read_file(LIBSSH_ECDSA_TESTKEY);
assert_true(key_str != NULL);
rc = ssh_pki_import_privkey_base64(key_str, passphrase, NULL, NULL, &key);
@@ -442,7 +379,7 @@ static void torture_pki_import_privkey_base64_ed25519(void **state){
(void) state; /* unused */
key_str = read_file(LIBSSH_ED25519_TESTKEY);
key_str = torture_pki_read_file(LIBSSH_ED25519_TESTKEY);
assert_true(key_str != NULL);
rc = ssh_pki_import_privkey_base64(key_str, passphrase, NULL, NULL, &key);
@@ -549,7 +486,7 @@ static void torture_pki_publickey_from_privatekey_ECDSA(void **state) {
(void) state; /* unused */
key_str = read_file(LIBSSH_ECDSA_TESTKEY);
key_str = torture_pki_read_file(LIBSSH_ECDSA_TESTKEY);
assert_true(key_str != NULL);
rc = ssh_pki_import_privkey_base64(key_str, passphrase, NULL, NULL, &key);
@@ -705,7 +642,7 @@ static void torture_pki_publickey_ecdsa_base64(void **state)
(void) state; /* unused */
key_buf = read_file(LIBSSH_ECDSA_TESTKEY ".pub");
key_buf = torture_pki_read_file(LIBSSH_ECDSA_TESTKEY ".pub");
assert_true(key_buf != NULL);
q = p = key_buf;