nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 03:22:48 -05:00
Code Issues Projects Releases Wiki Activity

Utility function ssh_key_clone().

Browse Source 
This makes a second independent copy of an existing ssh_key, for
situations where one piece of code is going to want to keep it after
its current owner frees it.

In order to have it work on an arbitrary ssh_key, whether public-only
or a full public+private key pair, I've had to add an ssh_key query
method to ask whether a private key is known. I'm surprised I haven't
found a need for that before! But I suppose in most situations in an
SSH client you statically know which kind of key you're dealing with.
This commit is contained in:
Simon Tatham
2022-04-20 13:51:28 +01:00
parent 180d1b78de
commit c2f1a563a5
6 changed files with 70 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/dsa.c
View File

@ -317,6 +317,12 @@ static void dsa_openssh_blob(ssh_key *key, BinarySink *bs)
put_mp_ssh2(bs, dsa->x);
}
static bool dsa_has_private(ssh_key *key)
{
struct dsa_key *dsa = container_of(key, struct dsa_key, sshk);
return dsa->x != NULL;
}
static int dsa_pubkey_bits(const ssh_keyalg *self, ptrlen pub)
{
ssh_key *sshk;
@ -495,6 +501,7 @@ const ssh_keyalg ssh_dsa = {
.public_blob = dsa_public_blob,
.private_blob = dsa_private_blob,
.openssh_blob = dsa_openssh_blob,
.has_private = dsa_has_private,
.cache_str = dsa_cache_str,
.components = dsa_components,
.pubkey_bits = dsa_pubkey_bits,

17
crypto/ecc-ssh.c
View File

@ -787,6 +787,12 @@ static void ecdsa_private_blob(ssh_key *key, BinarySink *bs)
put_mp_ssh2(bs, ek->privateKey);
}
static bool ecdsa_has_private(ssh_key *key)
{
struct ecdsa_key *ek = container_of(key, struct ecdsa_key, sshk);
return ek->privateKey != NULL;
}
static void eddsa_private_blob(ssh_key *key, BinarySink *bs)
{
struct eddsa_key *ek = container_of(key, struct eddsa_key, sshk);
@ -796,6 +802,12 @@ static void eddsa_private_blob(ssh_key *key, BinarySink *bs)
put_mp_le_fixedlen(bs, ek->privateKey, ek->curve->fieldBytes);
}
static bool eddsa_has_private(ssh_key *key)
{
struct eddsa_key *ek = container_of(key, struct eddsa_key, sshk);
return ek->privateKey != NULL;
}
static ssh_key *ecdsa_new_priv(const ssh_keyalg *alg, ptrlen pub, ptrlen priv)
{
ssh_key *sshk = ecdsa_new_pub(alg, pub);
@ -1254,6 +1266,7 @@ const ssh_keyalg ssh_ecdsa_ed25519 = {
.public_blob = eddsa_public_blob,
.private_blob = eddsa_private_blob,
.openssh_blob = eddsa_openssh_blob,
.has_private = eddsa_has_private,
.cache_str = eddsa_cache_str,
.components = eddsa_components,
.pubkey_bits = ec_shared_pubkey_bits,
@ -1279,6 +1292,7 @@ const ssh_keyalg ssh_ecdsa_ed448 = {
.public_blob = eddsa_public_blob,
.private_blob = eddsa_private_blob,
.openssh_blob = eddsa_openssh_blob,
.has_private = eddsa_has_private,
.cache_str = eddsa_cache_str,
.components = eddsa_components,
.pubkey_bits = ec_shared_pubkey_bits,
@ -1308,6 +1322,7 @@ const ssh_keyalg ssh_ecdsa_nistp256 = {
.public_blob = ecdsa_public_blob,
.private_blob = ecdsa_private_blob,
.openssh_blob = ecdsa_openssh_blob,
.has_private = ecdsa_has_private,
.cache_str = ecdsa_cache_str,
.components = ecdsa_components,
.pubkey_bits = ec_shared_pubkey_bits,
@ -1337,6 +1352,7 @@ const ssh_keyalg ssh_ecdsa_nistp384 = {
.public_blob = ecdsa_public_blob,
.private_blob = ecdsa_private_blob,
.openssh_blob = ecdsa_openssh_blob,
.has_private = ecdsa_has_private,
.cache_str = ecdsa_cache_str,
.components = ecdsa_components,
.pubkey_bits = ec_shared_pubkey_bits,
@ -1366,6 +1382,7 @@ const ssh_keyalg ssh_ecdsa_nistp521 = {
.public_blob = ecdsa_public_blob,
.private_blob = ecdsa_private_blob,
.openssh_blob = ecdsa_openssh_blob,
.has_private = ecdsa_has_private,
.cache_str = ecdsa_cache_str,
.components = ecdsa_components,
.pubkey_bits = ec_shared_pubkey_bits,

7
crypto/rsa.c
View File

@ -522,6 +522,12 @@ static key_components *rsa2_components(ssh_key *key)
return rsa_components(rsa);
}
static bool rsa2_has_private(ssh_key *key)
{
RSAKey *rsa = container_of(key, RSAKey, sshk);
return rsa->private_exponent != NULL;
}
static void rsa2_public_blob(ssh_key *key, BinarySink *bs)
{
RSAKey *rsa = container_of(key, RSAKey, sshk);
@ -869,6 +875,7 @@ static const struct ssh2_rsa_extra
.public_blob = rsa2_public_blob, \
.private_blob = rsa2_private_blob, \
.openssh_blob = rsa2_openssh_blob, \
.has_private = rsa2_has_private, \
.cache_str = rsa2_cache_str, \
.components = rsa2_components, \
.pubkey_bits = rsa2_pubkey_bits, \