From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 1 Nov 2019 02:32:05 +0000 (+0000)
Subject: upstream: remove duplicate PUBKEY_DEFAULT_PK_ALG on !WITH_OPENSSL path
X-Git-Tag: V_8_2_P1~367
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45f17a159acfc5a8e450bfbcc2cffe72950ed7a3;p=thirdparty%2Fopenssh-portable.git

upstream: remove duplicate PUBKEY_DEFAULT_PK_ALG on !WITH_OPENSSL path

OpenBSD-Commit-ID: 95a7cafad2a4665d57cabacc28031fabc0bea9fc
---

diff --git a/myproposal.h b/myproposal.h
index 5f528e4e1..a22649a2e 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"