diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-05-02 09:36:42 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-05-02 20:35:05 +1000 |
commit | 57464e3934ba53ad8590ee3ccd840f693407fc1e (patch) | |
tree | a87cc5d5de85e4ea3b735d8bff2dbc9f4b35f2dc /sshkey.c | |
parent | 1a31d02b2411c4718de58ce796dbb7b5e14db93e (diff) |
upstream commit
support SHA256 and SHA512 RSA signatures in certificates;
ok markus@
Upstream-ID: b45be2f2ce8cacd794dc5730edaabc90e5eb434a
Diffstat (limited to 'sshkey.c')
-rw-r--r-- | sshkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.c,v 1.32 2016/04/09 12:39:30 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.c,v 1.33 2016/05/02 09:36:42 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. | 4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. |
@@ -2370,7 +2370,7 @@ sshkey_drop_cert(struct sshkey *k) | |||
2370 | 2370 | ||
2371 | /* Sign a certified key, (re-)generating the signed certblob. */ | 2371 | /* Sign a certified key, (re-)generating the signed certblob. */ |
2372 | int | 2372 | int |
2373 | sshkey_certify(struct sshkey *k, struct sshkey *ca) | 2373 | sshkey_certify(struct sshkey *k, struct sshkey *ca, const char *alg) |
2374 | { | 2374 | { |
2375 | struct sshbuf *principals = NULL; | 2375 | struct sshbuf *principals = NULL; |
2376 | u_char *ca_blob = NULL, *sig_blob = NULL, nonce[32]; | 2376 | u_char *ca_blob = NULL, *sig_blob = NULL, nonce[32]; |
@@ -2460,7 +2460,7 @@ sshkey_certify(struct sshkey *k, struct sshkey *ca) | |||
2460 | 2460 | ||
2461 | /* Sign the whole mess */ | 2461 | /* Sign the whole mess */ |
2462 | if ((ret = sshkey_sign(ca, &sig_blob, &sig_len, sshbuf_ptr(cert), | 2462 | if ((ret = sshkey_sign(ca, &sig_blob, &sig_len, sshbuf_ptr(cert), |
2463 | sshbuf_len(cert), NULL, 0)) != 0) | 2463 | sshbuf_len(cert), alg, 0)) != 0) |
2464 | goto out; | 2464 | goto out; |
2465 | 2465 | ||
2466 | /* Append signature and we are done */ | 2466 | /* Append signature and we are done */ |