summaryrefslogtreecommitdiff
path: root/sshkey.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2019-11-12 19:29:24 +0000
committerDamien Miller <djm@mindrot.org>2019-11-13 08:48:48 +1100
commit7c096c456f33f3d2682736d4735cc10e790276e9 (patch)
tree50728b70f2b5a793fe6eb63c6da51256fd135add /sshkey.c
parentba5fb02bed1e556d0ce7b1740ae8a5f87b737491 (diff)
upstream: implement ssh-ed25519-sk verification; ok djm@
OpenBSD-Commit-ID: 37906d93948a1e3d237c20e713d6ca8fbf7d13f6
Diffstat (limited to 'sshkey.c')
-rw-r--r--sshkey.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sshkey.c b/sshkey.c
index 861d77689..b72f38a2f 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshkey.c,v 1.86 2019/10/31 21:23:19 djm Exp $ */ 1/* $OpenBSD: sshkey.c,v 1.87 2019/11/12 19:29:24 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Alexander von Gernler. All rights reserved. 4 * Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@@ -2750,6 +2750,10 @@ sshkey_verify(const struct sshkey *key,
2750 case KEY_ED25519: 2750 case KEY_ED25519:
2751 case KEY_ED25519_CERT: 2751 case KEY_ED25519_CERT:
2752 return ssh_ed25519_verify(key, sig, siglen, data, dlen, compat); 2752 return ssh_ed25519_verify(key, sig, siglen, data, dlen, compat);
2753 case KEY_ED25519_SK:
2754 case KEY_ED25519_SK_CERT:
2755 return ssh_ed25519_sk_verify(key, sig, siglen, data, dlen,
2756 compat);
2753#ifdef WITH_XMSS 2757#ifdef WITH_XMSS
2754 case KEY_XMSS: 2758 case KEY_XMSS:
2755 case KEY_XMSS_CERT: 2759 case KEY_XMSS_CERT: