summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-10-31 21:17:49 +0000
committerDamien Miller <djm@mindrot.org>2019-11-01 09:46:09 +1100
commit01a0670f69c5b86e471e033b92145d6c7cc77c58 (patch)
treef0250b52bf554982930f49927b5f5d8359a49a9b /myproposal.h
parent23f38c2d8cda3fad24e214e1f0133c42435b54ee (diff)
upstream: Separate myproposal.h userauth pubkey types
U2F/FIDO keys are not supported for host authentication, so we need a separate list for user keys. feedback & ok markus@ OpenBSD-Commit-ID: 7fe2e6ab85f9f2338866e5af8ca2d312abbf0429
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h25
1 files changed, 24 insertions, 1 deletions
diff --git a/myproposal.h b/myproposal.h
index 45db30e5..5f528e4e 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.58 2019/02/23 08:20:43 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.59 2019/10/31 21:17:49 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -144,6 +144,24 @@
"rsa-sha2-256," \
"ssh-rsa"
+#define PUBKEY_DEFAULT_PK_ALG \
+ "sk-ecdsa-sha2-nistp256-cert-v01@openssh.com," \
+ "ecdsa-sha2-nistp256-cert-v01@openssh.com," \
+ "ecdsa-sha2-nistp384-cert-v01@openssh.com," \
+ "ecdsa-sha2-nistp521-cert-v01@openssh.com," \
+ "ssh-ed25519-cert-v01@openssh.com," \
+ "rsa-sha2-512-cert-v01@openssh.com," \
+ "rsa-sha2-256-cert-v01@openssh.com," \
+ "ssh-rsa-cert-v01@openssh.com," \
+ "sk-ecdsa-sha2-nistp256@openssh.com," \
+ "ecdsa-sha2-nistp256," \
+ "ecdsa-sha2-nistp384," \
+ "ecdsa-sha2-nistp521," \
+ "ssh-ed25519," \
+ "rsa-sha2-512," \
+ "rsa-sha2-256," \
+ "ssh-rsa"
+
#else /* WITH_OPENSSL */
#define KEX_SERVER_KEX \
@@ -152,6 +170,7 @@
#define KEX_DEFAULT_PK_ALG \
"ssh-ed25519-cert-v01@openssh.com," \
"ssh-ed25519"
+#define PUBKEY_DEFAULT_PK_ALG KEX_DEFAULT_PK_ALG
#define KEX_SERVER_ENCRYPT \
"chacha20-poly1305@openssh.com," \
"aes128-ctr,aes192-ctr,aes256-ctr"
@@ -173,6 +192,10 @@
#define SSH_ALLOWED_CA_SIGALGS "ssh-ed25519"
+#define PUBKEY_DEFAULT_PK_ALG \
+ "ssh-ed25519-cert-v01@openssh.com," \
+ "ssh-ed25519"
+
#endif /* WITH_OPENSSL */
#define KEX_DEFAULT_COMP "none,zlib@openssh.com"