summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-01-24 00:28:57 +0000
committerDamien Miller <djm@mindrot.org>2020-01-25 11:27:29 +1100
commitc3368a5d5ec368ef6bdf9971d6330ca0e3bdca06 (patch)
treec26e9a4790b8fe807c8ee8301273c6a9a86b3008 /myproposal.h
parent4a41d245d6b13bd3882c8dc058dbd2e2b39a9f67 (diff)
upstream: remove ssh-rsa (SHA1) from the list of allowed CA
signature algorithms ok markus OpenBSD-Commit-ID: da3481fca8c81e6951f319a86b7be67502237f57
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/myproposal.h b/myproposal.h
index dd2499d66..5312e6058 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: myproposal.h,v 1.66 2020/01/23 02:46:49 dtucker Exp $ */ 1/* $OpenBSD: myproposal.h,v 1.67 2020/01/24 00:28:57 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -87,8 +87,7 @@
87 "ssh-ed25519," \ 87 "ssh-ed25519," \
88 "sk-ssh-ed25519@openssh.com," \ 88 "sk-ssh-ed25519@openssh.com," \
89 "rsa-sha2-512," \ 89 "rsa-sha2-512," \
90 "rsa-sha2-256," \ 90 "rsa-sha2-256"
91 "ssh-rsa"
92 91
93#define KEX_DEFAULT_COMP "none,zlib@openssh.com" 92#define KEX_DEFAULT_COMP "none,zlib@openssh.com"
94#define KEX_DEFAULT_LANG "" 93#define KEX_DEFAULT_LANG ""