version 1.438, 2021/10/02 03:17:01 |
version 1.439, 2021/10/28 02:54:18 |
|
|
return passphrase1; |
return passphrase1; |
} |
} |
|
|
static const char * |
static char * |
skip_ssh_url_preamble(const char *s) |
sk_suffix(const char *application, const uint8_t *user, size_t userlen) |
{ |
{ |
if (strncmp(s, "ssh://", 6) == 0) |
char *ret, *cp; |
return s + 6; |
size_t slen, i; |
else if (strncmp(s, "ssh:", 4) == 0) |
|
return s + 4; |
/* Trim off URL-like preamble */ |
return s; |
if (strncmp(application, "ssh://", 6) == 0) |
|
ret = xstrdup(application + 6); |
|
else if (strncmp(application, "ssh:", 4) == 0) |
|
ret = xstrdup(application + 4); |
|
else |
|
ret = xstrdup(application); |
|
|
|
/* Count trailing zeros in user */ |
|
for (i = 0; i < userlen; i++) { |
|
if (user[userlen - i - 1] != 0) |
|
break; |
|
} |
|
if (i >= userlen) |
|
return ret; /* user-id was default all-zeros */ |
|
|
|
/* Append user-id, escaping non-UTF-8 characters */ |
|
slen = userlen - i; |
|
if (asmprintf(&cp, INT_MAX, NULL, "%.*s", (int)slen, user) == -1) |
|
fatal_f("asmprintf failed"); |
|
/* Don't emit a user-id that contains path or control characters */ |
|
if (strchr(cp, '/') != NULL || strstr(cp, "..") != NULL || |
|
strchr(cp, '\\') != NULL) { |
|
free(cp); |
|
cp = tohex(user, slen); |
|
} |
|
xextendf(&ret, "_", "%s", cp); |
|
free(cp); |
|
return ret; |
} |
} |
|
|
static int |
static int |
do_download_sk(const char *skprovider, const char *device) |
do_download_sk(const char *skprovider, const char *device) |
{ |
{ |
struct sshkey **keys; |
struct sshsk_resident_key **srks; |
size_t nkeys, i; |
size_t nsrks, i; |
int r, ret = -1; |
int r, ret = -1; |
char *fp, *pin = NULL, *pass = NULL, *path, *pubpath; |
char *fp, *pin = NULL, *pass = NULL, *path, *pubpath; |
const char *ext; |
const char *ext; |
|
struct sshkey *key; |
|
|
if (skprovider == NULL) |
if (skprovider == NULL) |
fatal("Cannot download keys without provider"); |
fatal("Cannot download keys without provider"); |
|
|
printf("You may need to touch your authenticator " |
printf("You may need to touch your authenticator " |
"to authorize key download.\n"); |
"to authorize key download.\n"); |
} |
} |
if ((r = sshsk_load_resident(skprovider, device, pin, |
if ((r = sshsk_load_resident(skprovider, device, pin, 0, |
&keys, &nkeys)) != 0) { |
&srks, &nsrks)) != 0) { |
if (pin != NULL) |
if (pin != NULL) |
freezero(pin, strlen(pin)); |
freezero(pin, strlen(pin)); |
error_r(r, "Unable to load resident keys"); |
error_r(r, "Unable to load resident keys"); |
return -1; |
return -1; |
} |
} |
if (nkeys == 0) |
if (nsrks == 0) |
logit("No keys to download"); |
logit("No keys to download"); |
if (pin != NULL) |
if (pin != NULL) |
freezero(pin, strlen(pin)); |
freezero(pin, strlen(pin)); |
|
|
for (i = 0; i < nkeys; i++) { |
for (i = 0; i < nsrks; i++) { |
if (keys[i]->type != KEY_ECDSA_SK && |
key = srks[i]->key; |
keys[i]->type != KEY_ED25519_SK) { |
if (key->type != KEY_ECDSA_SK && key->type != KEY_ED25519_SK) { |
error("Unsupported key type %s (%d)", |
error("Unsupported key type %s (%d)", |
sshkey_type(keys[i]), keys[i]->type); |
sshkey_type(key), key->type); |
continue; |
continue; |
} |
} |
if ((fp = sshkey_fingerprint(keys[i], |
if ((fp = sshkey_fingerprint(key, fingerprint_hash, |
fingerprint_hash, SSH_FP_DEFAULT)) == NULL) |
SSH_FP_DEFAULT)) == NULL) |
fatal_f("sshkey_fingerprint failed"); |
fatal_f("sshkey_fingerprint failed"); |
debug_f("key %zu: %s %s %s (flags 0x%02x)", i, |
debug_f("key %zu: %s %s %s (flags 0x%02x)", i, |
sshkey_type(keys[i]), fp, keys[i]->sk_application, |
sshkey_type(key), fp, key->sk_application, key->sk_flags); |
keys[i]->sk_flags); |
ext = sk_suffix(key->sk_application, |
ext = skip_ssh_url_preamble(keys[i]->sk_application); |
srks[i]->user_id, srks[i]->user_id_len); |
xasprintf(&path, "id_%s_rk%s%s", |
xasprintf(&path, "id_%s_rk%s%s", |
keys[i]->type == KEY_ECDSA_SK ? "ecdsa_sk" : "ed25519_sk", |
key->type == KEY_ECDSA_SK ? "ecdsa_sk" : "ed25519_sk", |
*ext == '\0' ? "" : "_", ext); |
*ext == '\0' ? "" : "_", ext); |
|
|
/* If the file already exists, ask the user to confirm. */ |
/* If the file already exists, ask the user to confirm. */ |
|
|
/* Save the key with the application string as the comment */ |
/* Save the key with the application string as the comment */ |
if (pass == NULL) |
if (pass == NULL) |
pass = private_key_passphrase(); |
pass = private_key_passphrase(); |
if ((r = sshkey_save_private(keys[i], path, pass, |
if ((r = sshkey_save_private(key, path, pass, |
keys[i]->sk_application, private_key_format, |
key->sk_application, private_key_format, |
openssh_format_cipher, rounds)) != 0) { |
openssh_format_cipher, rounds)) != 0) { |
error_r(r, "Saving key \"%s\" failed", path); |
error_r(r, "Saving key \"%s\" failed", path); |
free(path); |
free(path); |
break; |
break; |
} |
} |
if (!quiet) { |
if (!quiet) { |
printf("Saved %s key%s%s to %s\n", |
printf("Saved %s key%s%s to %s\n", sshkey_type(key), |
sshkey_type(keys[i]), |
|
*ext != '\0' ? " " : "", |
*ext != '\0' ? " " : "", |
*ext != '\0' ? keys[i]->sk_application : "", |
*ext != '\0' ? key->sk_application : "", |
path); |
path); |
} |
} |
|
|
/* Save public key too */ |
/* Save public key too */ |
xasprintf(&pubpath, "%s.pub", path); |
xasprintf(&pubpath, "%s.pub", path); |
free(path); |
free(path); |
if ((r = sshkey_save_public(keys[i], pubpath, |
if ((r = sshkey_save_public(key, pubpath, |
keys[i]->sk_application)) != 0) { |
key->sk_application)) != 0) { |
error_r(r, "Saving public key \"%s\" failed", pubpath); |
error_r(r, "Saving public key \"%s\" failed", pubpath); |
free(pubpath); |
free(pubpath); |
break; |
break; |
|
|
free(pubpath); |
free(pubpath); |
} |
} |
|
|
if (i >= nkeys) |
if (i >= nsrks) |
ret = 0; /* success */ |
ret = 0; /* success */ |
if (pass != NULL) |
if (pass != NULL) |
freezero(pass, strlen(pass)); |
freezero(pass, strlen(pass)); |
for (i = 0; i < nkeys; i++) |
sshsk_free_resident_keys(srks, nsrks); |
sshkey_free(keys[i]); |
|
free(keys); |
|
return ret; |
return ret; |
} |
} |
|
|