diff options
author | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:25:59 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:25:59 +0100 |
commit | 716621abf50722a46f97ecafed5ce134c94f1a81 (patch) | |
tree | 9993f08b7ea89f3038c3cfcf8fd1c71bdc7e7ae7 /key.c | |
parent | ae31b42e02d7bf7004ec0302088f4e169c0f08ce (diff) | |
parent | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (diff) |
* New upstream release:
- Unbreak sshd_config's AuthorizedKeysFile option for $HOME-relative
paths.
- Include a language tag when sending a protocol 2 disconnection
message.
- Make logging of certificates used for user authentication more clear
and consistent between CAs specified using TrustedUserCAKeys and
authorized_keys.
Diffstat (limited to 'key.c')
-rw-r--r-- | key.c | 15 |
1 files changed, 14 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: key.c,v 1.85 2010/03/04 01:44:57 djm Exp $ */ | 1 | /* $OpenBSD: key.c,v 1.86 2010/03/15 19:40:02 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * read_bignum(): | 3 | * read_bignum(): |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -802,6 +802,19 @@ key_type(const Key *k) | |||
802 | } | 802 | } |
803 | 803 | ||
804 | const char * | 804 | const char * |
805 | key_cert_type(const Key *k) | ||
806 | { | ||
807 | switch (k->cert->type) { | ||
808 | case SSH2_CERT_TYPE_USER: | ||
809 | return "user"; | ||
810 | case SSH2_CERT_TYPE_HOST: | ||
811 | return "host"; | ||
812 | default: | ||
813 | return "unknown"; | ||
814 | } | ||
815 | } | ||
816 | |||
817 | const char * | ||
805 | key_ssh_name(const Key *k) | 818 | key_ssh_name(const Key *k) |
806 | { | 819 | { |
807 | switch (k->type) { | 820 | switch (k->type) { |