"rsa") in user-interface code and require full SSH protocol names (e.g.
"ssh-rsa") everywhere else.
Prompted by bz3725; ok markus@
-/* $OpenBSD: ssh-keygen.c,v 1.473 2024/08/15 00:51:51 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.474 2024/09/04 05:33:34 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
if (key_type_name == NULL)
name = _PATH_SSH_CLIENT_ID_ED25519;
else {
- switch (sshkey_type_from_name(key_type_name)) {
+ switch (sshkey_type_from_shortname(key_type_name)) {
#ifdef WITH_DSA
case KEY_DSA_CERT:
case KEY_DSA:
}
printf("%s ", key_types[i].key_type_display);
fflush(stdout);
- type = sshkey_type_from_name(key_types[i].key_type);
+ type = sshkey_type_from_shortname(key_types[i].key_type);
if ((fd = mkstemp(prv_tmp)) == -1) {
error("Could not save your private key in %s: %s",
prv_tmp, strerror(errno));
free(tmp);
if (key_type_name != NULL) {
- if (sshkey_type_from_name(key_type_name) != ca->type) {
+ if (sshkey_type_from_shortname(key_type_name) != ca->type) {
fatal("CA key type %s doesn't match specified %s",
sshkey_ssh_name(ca), key_type_name);
}
if (key_type_name == NULL)
key_type_name = DEFAULT_KEY_TYPE_NAME;
- type = sshkey_type_from_name(key_type_name);
+ type = sshkey_type_from_shortname(key_type_name);
type_bits_valid(type, key_type_name, &bits);
if (!quiet)
-/* $OpenBSD: ssh-keyscan.c,v 1.159 2024/09/02 12:13:56 djm Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.160 2024/09/04 05:33:34 djm Exp $ */
/*
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
*
get_keytypes = 0;
tname = strtok(optarg, ",");
while (tname) {
- int type = sshkey_type_from_name(tname);
+ int type = sshkey_type_from_shortname(tname);
switch (type) {
#ifdef WITH_DSA
-/* $OpenBSD: sshkey.c,v 1.145 2024/08/20 11:10:04 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.146 2024/09/04 05:33:34 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved.
k->ecdsa_nid);
}
-int
-sshkey_type_from_name(const char *name)
+static int
+type_from_name(const char *name, int allow_short)
{
int i;
const struct sshkey_impl *impl;
for (i = 0; keyimpls[i] != NULL; i++) {
impl = keyimpls[i];
+ if (impl->name != NULL && strcmp(name, impl->name) == 0)
+ return impl->type;
/* Only allow shortname matches for plain key types */
- if ((impl->name != NULL && strcmp(name, impl->name) == 0) ||
- (!impl->cert && strcasecmp(impl->shortname, name) == 0))
+ if (allow_short && !impl->cert && impl->shortname != NULL &&
+ strcasecmp(impl->shortname, name) == 0)
return impl->type;
}
return KEY_UNSPEC;
}
+int
+sshkey_type_from_name(const char *name)
+{
+ return type_from_name(name, 0);
+}
+
+int
+sshkey_type_from_shortname(const char *name)
+{
+ return type_from_name(name, 1);
+}
+
static int
key_type_is_ecdsa_variant(int type)
{
-/* $OpenBSD: sshkey.h,v 1.64 2024/08/15 00:51:51 djm Exp $ */
+/* $OpenBSD: sshkey.h,v 1.65 2024/09/04 05:33:34 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
int sshkey_unshield_private(struct sshkey *);
int sshkey_type_from_name(const char *);
+int sshkey_type_from_shortname(const char *);
int sshkey_is_cert(const struct sshkey *);
int sshkey_is_sk(const struct sshkey *);
int sshkey_type_is_cert(int);