summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2015-12-04 16:41:28 +0000
committerDamien Miller <djm@mindrot.org>2015-12-07 12:38:58 +1100
commit76c9fbbe35aabc1db977fb78e827644345e9442e (patch)
treee7c85e7e1471f1bd00b3a50a58e315c055f40b86 /myproposal.h
parent6064a8b8295cb5a17b5ebcfade53053377714f40 (diff)
downloadopenssh-git-76c9fbbe35aabc1db977fb78e827644345e9442e.tar.gz
upstream commit
implement SHA2-{256,512} for RSASSA-PKCS1-v1_5 signatures (user and host auth) based on draft-rsa-dsa-sha2-256-03.txt and draft-ssh-ext-info-04.txt; with & ok djm@ Upstream-ID: cf82ce532b2733e5c4b34bb7b7c94835632db309
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/myproposal.h b/myproposal.h
index 46e5b988..c6429588 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.47 2015/07/10 06:21:53 markus Exp $ */
+/* $OpenBSD: myproposal.h,v 1.48 2015/12/04 16:41:28 markus Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -101,7 +101,9 @@
"ssh-rsa-cert-v01@openssh.com," \
HOSTKEY_ECDSA_METHODS \
"ssh-ed25519," \
- "ssh-rsa" \
+ "rsa-sha2-256," \
+ "rsa-sha2-512," \
+ "ssh-rsa"
/* the actual algorithms */