Commit 611fbe4f9b7d2682c8b2653e8abc9dcf5a9a984c
2019-04-16T12:02:20
examples: implement SSH key credentials Implement SSH key credentials. This allows users to use the SSH transport with the lg2 example code.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
diff --git a/examples/common.c b/examples/common.c
index e90538c..0b52eb5 100644
--- a/examples/common.c
+++ b/examples/common.c
@@ -330,12 +330,12 @@ error:
return error;
}
-static int ask(char **out, const char *prompt)
+static int ask(char **out, const char *prompt, char optional)
{
printf("%s ", prompt);
fflush(stdout);
- if (!readline(out)) {
+ if (!readline(out) && !optional) {
fprintf(stderr, "Could not read response: %s", strerror(errno));
return -1;
}
@@ -359,9 +359,9 @@ int cred_acquire_cb(git_cred **out,
if (allowed_types & GIT_CREDTYPE_SSH_KEY) {
int n;
- if ((error = ask(&username, "Username:")) < 0 ||
- (error = ask(&privkey, "SSH Key:")) < 0 ||
- (error = ask(&password, "Password:")) < 0)
+ if ((error = ask(&username, "Username:", 0)) < 0 ||
+ (error = ask(&privkey, "SSH Key:", 0)) < 0 ||
+ (error = ask(&password, "Password:", 1)) < 0)
goto out;
if ((n = snprintf(NULL, 0, "%s.pub", privkey)) < 0 ||
@@ -371,13 +371,13 @@ int cred_acquire_cb(git_cred **out,
error = git_cred_ssh_key_new(out, username, pubkey, privkey, password);
} else if (allowed_types & GIT_CREDTYPE_USERPASS_PLAINTEXT) {
- if ((error = ask(&username, "Username:")) < 0 ||
- (error = ask(&password, "Password:")) < 0)
+ if ((error = ask(&username, "Username:", 0)) < 0 ||
+ (error = ask(&password, "Password:", 1)) < 0)
goto out;
error = git_cred_userpass_plaintext_new(out, username, password);
} else if (allowed_types & GIT_CREDTYPE_USERNAME) {
- if ((error = ask(&username, "Username:")) < 0)
+ if ((error = ask(&username, "Username:", 0)) < 0)
goto out;
error = git_cred_username_new(out, username);