summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/transports/cred.c2
-rw-r--r--src/transports/ssh.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/transports/cred.c b/src/transports/cred.c
index 35aaf4f91..79b17e88d 100644
--- a/src/transports/cred.c
+++ b/src/transports/cred.c
@@ -58,7 +58,7 @@ int git_cred_userpass_plaintext_new(
{
git_cred_userpass_plaintext *c;
- assert(cred);
+ assert(cred && username && password);
c = git__malloc(sizeof(git_cred_userpass_plaintext));
GITERR_CHECK_ALLOC(c);
diff --git a/src/transports/ssh.c b/src/transports/ssh.c
index 62f3f0bbf..647211f63 100644
--- a/src/transports/ssh.c
+++ b/src/transports/ssh.c
@@ -349,7 +349,8 @@ static int _git_ssh_setup_conn(
if (t->owner->cred_acquire_cb(
&t->cred, t->owner->url, user,
GIT_CREDTYPE_USERPASS_PLAINTEXT |
- GIT_CREDTYPE_SSH_KEYFILE_PASSPHRASE,
+ GIT_CREDTYPE_SSH_KEYFILE_PASSPHRASE |
+ GIT_CREDTYPE_SSH_PUBLICKEY,
t->owner->cred_acquire_payload) < 0)
goto on_error;