tests: Use public testkey passphrase function in pki test.

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Aris Adamantiadis <aris@0xbadc0de.be>
This commit is contained in:
Andreas Schneider
2014-08-15 12:27:47 +02:00
parent c6210f5aef
commit 25eb9c4914

View File

@@ -8,7 +8,6 @@
#define LIBSSH_RSA_TESTKEY "libssh_testkey.id_rsa" #define LIBSSH_RSA_TESTKEY "libssh_testkey.id_rsa"
#define LIBSSH_DSA_TESTKEY "libssh_testkey.id_dsa" #define LIBSSH_DSA_TESTKEY "libssh_testkey.id_dsa"
#define LIBSSH_ECDSA_TESTKEY "libssh_testkey.id_ecdsa" #define LIBSSH_ECDSA_TESTKEY "libssh_testkey.id_ecdsa"
#define LIBSSH_PASSPHRASE "libssh-rocks"
const unsigned char HASH[] = "12345678901234567890"; const unsigned char HASH[] = "12345678901234567890";
@@ -185,7 +184,7 @@ static void torture_pki_import_privkey_base64_RSA(void **state) {
int rc; int rc;
char *key_str; char *key_str;
ssh_key key; ssh_key key;
const char *passphrase = LIBSSH_PASSPHRASE; const char *passphrase = torture_get_testkey_passphrase();
enum ssh_keytypes_e type; enum ssh_keytypes_e type;
(void) state; /* unused */ (void) state; /* unused */
@@ -208,7 +207,7 @@ static void torture_pki_import_privkey_base64_RSA(void **state) {
static void torture_pki_import_privkey_base64_NULL_key(void **state) { static void torture_pki_import_privkey_base64_NULL_key(void **state) {
int rc; int rc;
const char *passphrase = LIBSSH_PASSPHRASE; const char *passphrase = torture_get_testkey_passphrase();
(void) state; /* unused */ (void) state; /* unused */
@@ -225,7 +224,7 @@ static void torture_pki_import_privkey_base64_NULL_key(void **state) {
static void torture_pki_import_privkey_base64_NULL_str(void **state) { static void torture_pki_import_privkey_base64_NULL_str(void **state) {
int rc; int rc;
ssh_key key = NULL; ssh_key key = NULL;
const char *passphrase = LIBSSH_PASSPHRASE; const char *passphrase = torture_get_testkey_passphrase();
(void) state; /* unused */ (void) state; /* unused */
@@ -239,7 +238,7 @@ static void torture_pki_import_privkey_base64_NULL_str(void **state) {
static void torture_pki_import_privkey_base64_DSA(void **state) { static void torture_pki_import_privkey_base64_DSA(void **state) {
int rc; int rc;
ssh_key key; ssh_key key;
const char *passphrase = LIBSSH_PASSPHRASE; const char *passphrase = torture_get_testkey_passphrase();
(void) state; /* unused */ (void) state; /* unused */
@@ -258,7 +257,7 @@ static void torture_pki_import_privkey_base64_ECDSA(void **state) {
int rc; int rc;
char *key_str; char *key_str;
ssh_key key; ssh_key key;
const char *passphrase = LIBSSH_PASSPHRASE; const char *passphrase = torture_get_testkey_passphrase();
(void) state; /* unused */ (void) state; /* unused */
@@ -276,7 +275,7 @@ static void torture_pki_import_privkey_base64_ECDSA(void **state) {
static void torture_pki_import_privkey_base64_passphrase(void **state) { static void torture_pki_import_privkey_base64_passphrase(void **state) {
int rc; int rc;
ssh_key key = NULL; ssh_key key = NULL;
const char *passphrase = LIBSSH_PASSPHRASE; const char *passphrase = torture_get_testkey_passphrase();
(void) state; /* unused */ (void) state; /* unused */