torture_pki_ecdsa: Add tests for private key with passphrase

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>

tests/unittests/torture_pki_ecdsa.c

@@ -11,6 +11,7 @@
 #include "pki.c"
 
 #define LIBSSH_ECDSA_TESTKEY "libssh_testkey.id_ecdsa"
+#define LIBSSH_ECDSA_TESTKEY_PASSPHRASE "libssh_testkey_passphrase.id_ecdsa"
 
 const unsigned char ECDSA_HASH[] = "12345678901234567890";
 
@@ -19,10 +20,13 @@ static int setup_ecdsa_key(void **state, int ecdsa_bits)
     (void) state; /* unused */
 
     unlink(LIBSSH_ECDSA_TESTKEY);
+    unlink(LIBSSH_ECDSA_TESTKEY_PASSPHRASE);
     unlink(LIBSSH_ECDSA_TESTKEY ".pub");
 
     torture_write_file(LIBSSH_ECDSA_TESTKEY,
                        torture_get_testkey(SSH_KEYTYPE_ECDSA, ecdsa_bits, 0));
+    torture_write_file(LIBSSH_ECDSA_TESTKEY_PASSPHRASE,
+                       torture_get_testkey(SSH_KEYTYPE_ECDSA, ecdsa_bits, 0));
     torture_write_file(LIBSSH_ECDSA_TESTKEY ".pub",
                        torture_get_testkey_pub(SSH_KEYTYPE_ECDSA, ecdsa_bits));
 
@@ -55,6 +59,7 @@ static int teardown(void **state)
     (void) state; /* unused */
 
     unlink(LIBSSH_ECDSA_TESTKEY);
+    unlink(LIBSSH_ECDSA_TESTKEY_PASSPHRASE);
     unlink(LIBSSH_ECDSA_TESTKEY ".pub");
 
     return 0;
@@ -372,6 +377,43 @@ static void torture_pki_ecdsa_write_privkey(void **state)
 
     ssh_key_free(origkey);
     ssh_key_free(privkey);
+
+    /* Test with passphrase */
+    rc = ssh_pki_import_privkey_file(LIBSSH_ECDSA_TESTKEY_PASSPHRASE,
+                                     torture_get_testkey_passphrase(),
+                                     NULL,
+                                     NULL,
+                                     &origkey);
+    assert_true(rc == 0);
+
+    unlink(LIBSSH_ECDSA_TESTKEY_PASSPHRASE);
+    rc = ssh_pki_export_privkey_file(origkey,
+                                     torture_get_testkey_passphrase(),
+                                     NULL,
+                                     NULL,
+                                     LIBSSH_ECDSA_TESTKEY_PASSPHRASE);
+    assert_true(rc == 0);
+
+    /* Test with invalid passphrase */
+    rc = ssh_pki_import_privkey_file(LIBSSH_ECDSA_TESTKEY_PASSPHRASE,
+                                     "invalid secret",
+                                     NULL,
+                                     NULL,
+                                     &privkey);
+    assert_true(rc == SSH_ERROR);
+
+    rc = ssh_pki_import_privkey_file(LIBSSH_ECDSA_TESTKEY_PASSPHRASE,
+                                     torture_get_testkey_passphrase(),
+                                     NULL,
+                                     NULL,
+                                     &privkey);
+    assert_true(rc == 0);
+
+    rc = ssh_key_cmp(origkey, privkey, SSH_KEY_CMP_PRIVATE);
+    assert_true(rc == 0);
+
+    ssh_key_free(origkey);
+    ssh_key_free(privkey);
 }
 
 static void torture_pki_ecdsa_name(void **state, const char *expected_name)