mirror of git://anongit.mindrot.org/openssh.git
upstream: remove duplicate PUBKEY_DEFAULT_PK_ALG on !WITH_OPENSSL path
OpenBSD-Commit-ID: 95a7cafad2a4665d57cabacc28031fabc0bea9fc
This commit is contained in:
parent
db8d13f792
commit
45f17a159a
|
@ -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.
|
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
||||||
|
@ -192,10 +192,6 @@
|
||||||
|
|
||||||
#define SSH_ALLOWED_CA_SIGALGS "ssh-ed25519"
|
#define SSH_ALLOWED_CA_SIGALGS "ssh-ed25519"
|
||||||
|
|
||||||
#define PUBKEY_DEFAULT_PK_ALG \
|
|
||||||
"ssh-ed25519-cert-v01@openssh.com," \
|
|
||||||
"ssh-ed25519"
|
|
||||||
|
|
||||||
#endif /* WITH_OPENSSL */
|
#endif /* WITH_OPENSSL */
|
||||||
|
|
||||||
#define KEX_DEFAULT_COMP "none,zlib@openssh.com"
|
#define KEX_DEFAULT_COMP "none,zlib@openssh.com"
|
||||||
|
|
Loading…
Reference in New Issue