lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

pki: Derive correct algorithm identification for certificate authentication with SHA2 extension

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jakub Jelen
2019-05-29 16:04:42 +02:00
committed by Andreas Schneider
parent 132ed59d3f
commit a3ddc48cb0
1 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/pki.c
View File

@@ -213,10 +213,8 @@ const char *
ssh_key_signature_to_char(enum ssh_keytypes_e type, ssh_key_signature_to_char(enum ssh_keytypes_e type,
enum ssh_digest_e hash_type) enum ssh_digest_e hash_type)
{ {
if (type != SSH_KEYTYPE_RSA) { switch (type) {
return ssh_key_type_to_char(type); case SSH_KEYTYPE_RSA:
}
switch (hash_type) { switch (hash_type) {
case SSH_DIGEST_SHA256: case SSH_DIGEST_SHA256:
return "rsa-sha2-256"; return "rsa-sha2-256";
@@ -228,6 +226,23 @@ ssh_key_signature_to_char(enum ssh_keytypes_e type,
default: default:
return NULL; return NULL;
} }
break;
case SSH_KEYTYPE_RSA_CERT01:
switch (hash_type) {
case SSH_DIGEST_SHA256:
return "rsa-sha2-256-cert-v01@openssh.com";
case SSH_DIGEST_SHA512:
return "rsa-sha2-512-cert-v01@openssh.com";
case SSH_DIGEST_SHA1:
case SSH_DIGEST_AUTO:
return "ssh-rsa-cert-v01@openssh.com";
default:
return NULL;
}
break;
default:
return ssh_key_type_to_char(type);
}
/* We should never reach this */ /* We should never reach this */
return NULL; return NULL;