summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-11-01 02:32:05 +0000
committerDamien Miller <djm@mindrot.org>2019-11-01 13:33:44 +1100
commit45f17a159acfc5a8e450bfbcc2cffe72950ed7a3 (patch)
treee07f417b367561fe28d9078324c4df079d281157 /myproposal.h
parentdb8d13f7925da7337df87248995c533e111637ec (diff)
upstream: remove duplicate PUBKEY_DEFAULT_PK_ALG on !WITH_OPENSSL path
OpenBSD-Commit-ID: 95a7cafad2a4665d57cabacc28031fabc0bea9fc
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/myproposal.h b/myproposal.h
index 5f528e4e..a22649a2 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.59 2019/10/31 21:17:49 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.60 2019/11/01 02:32:05 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -192,10 +192,6 @@
#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"