diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-12-04 16:41:28 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-12-07 12:38:58 +1100 |
commit | 76c9fbbe35aabc1db977fb78e827644345e9442e (patch) | |
tree | e7c85e7e1471f1bd00b3a50a58e315c055f40b86 /ssh-keysign.c | |
parent | 6064a8b8295cb5a17b5ebcfade53053377714f40 (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 'ssh-keysign.c')
-rw-r--r-- | ssh-keysign.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c index 4c99609b2..1d49861ae 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keysign.c,v 1.50 2015/11/29 22:18:37 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keysign.c,v 1.51 2015/12/04 16:41:28 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -291,7 +291,8 @@ main(int argc, char **argv) | |||
291 | sshkey_type(key), fp ? fp : ""); | 291 | sshkey_type(key), fp ? fp : ""); |
292 | } | 292 | } |
293 | 293 | ||
294 | if ((r = sshkey_sign(keys[i], &signature, &slen, data, dlen, 0)) != 0) | 294 | if ((r = sshkey_sign(keys[i], &signature, &slen, data, dlen, NULL, 0)) |
295 | != 0) | ||
295 | fatal("sshkey_sign failed: %s", ssh_err(r)); | 296 | fatal("sshkey_sign failed: %s", ssh_err(r)); |
296 | free(data); | 297 | free(data); |
297 | 298 | ||