openbsd/libopenssh
1
0
Fork 0
mirror of https://github.com/openssh/libopenssh synced 2026-04-16 17:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conversion of key types to "plain" (non-cert) names

Browse Source 
makes cert-* regress pass
This commit is contained in:
Damien Miller
2012-01-12 13:09:42 +11:00
committed by Markus Friedl
parent 207b5422e6
commit c90c1905fd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ssh/key.c
View File

@@ -115,13 +115,12 @@ sshkey_cert_type(const struct sshkey *k)
}
static const char *
sshkey_ssh_name_from_type_nid(int type, int nid, int plain)
sshkey_ssh_name_from_type_nid(int type, int nid)
{
const struct keytype *kt;
for (kt = key_types; kt->name != NULL; kt++) {
if (type == (plain ? kt->plain_type : kt->type) &&
(kt->nid == -1 || kt->nid == nid))
if (type == kt->type && (kt->nid == -1 || kt->nid == nid))
return kt->ssh2name;
}
return "ssh-unknown";
@@ -130,13 +129,14 @@ sshkey_ssh_name_from_type_nid(int type, int nid, int plain)
const char *
sshkey_ssh_name(const struct sshkey *k)
{
return sshkey_ssh_name_from_type_nid(k->type, k->ecdsa_nid, 0);
return sshkey_ssh_name_from_type_nid(k->type, k->ecdsa_nid);
}
const char *
sshkey_ssh_name_plain(const struct sshkey *k)
{
return sshkey_ssh_name_from_type_nid(k->type, k->ecdsa_nid, 1);
return sshkey_ssh_name_from_type_nid(sshkey_type_plain(k->type),
k->ecdsa_nid);
}
int