summaryrefslogtreecommitdiff
path: root/kexc25519s.c
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 /kexc25519s.c
parent6064a8b8295cb5a17b5ebcfade53053377714f40 (diff)
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 'kexc25519s.c')
-rw-r--r--kexc25519s.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kexc25519s.c b/kexc25519s.c
index 240272533..4e77622b0 100644
--- a/kexc25519s.c
+++ b/kexc25519s.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kexc25519s.c,v 1.9 2015/04/27 00:37:53 dtucker Exp $ */ 1/* $OpenBSD: kexc25519s.c,v 1.10 2015/12/04 16:41:28 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * Copyright (c) 2010 Damien Miller. All rights reserved. 4 * Copyright (c) 2010 Damien Miller. All rights reserved.
@@ -134,8 +134,8 @@ input_kex_c25519_init(int type, u_int32_t seq, void *ctxt)
134 } 134 }
135 135
136 /* sign H */ 136 /* sign H */
137 if ((r = kex->sign(server_host_private, server_host_public, 137 if ((r = kex->sign(server_host_private, server_host_public, &signature,
138 &signature, &slen, hash, hashlen, ssh->compat)) < 0) 138 &slen, hash, hashlen, kex->hostkey_alg, ssh->compat)) < 0)
139 goto out; 139 goto out;
140 140
141 /* send server hostkey, ECDH pubkey 'Q_S' and signed H */ 141 /* send server hostkey, ECDH pubkey 'Q_S' and signed H */