diff options
| author |   djm <djm@openbsd.org> | 2016-05-02 09:36:42 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2016-05-02 09:36:42 +0000 |
| commit | 3564fe6b9d8519e8c963d898b90d107ff9d7719f (patch) | |
| tree | 293677b65b1e9d0f886354d71c033dac44145679 /usr.bin/ssh/sshkey.c | |
| parent | Fix a corner case of 12-bit arithmetic: also increment the ba_winmiss (diff) | |
| download | wireguard-openbsd-3564fe6b9d8519e8c963d898b90d107ff9d7719f.tar.xz wireguard-openbsd-3564fe6b9d8519e8c963d898b90d107ff9d7719f.zip | |
support SHA256 and SHA512 RSA signatures in certificates;
ok markus@
Diffstat (limited to 'usr.bin/ssh/sshkey.c')
| -rw-r--r-- | usr.bin/ssh/sshkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index 2b7fb55495a..b8a80532477 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.32 2016/04/09 12:39:30 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.33 2016/05/02 09:36:42 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -2326,7 +2326,7 @@ sshkey_drop_cert(struct sshkey *k) /* Sign a certified key, (re-)generating the signed certblob. */ int -sshkey_certify(struct sshkey *k, struct sshkey *ca) +sshkey_certify(struct sshkey *k, struct sshkey *ca, const char *alg) { struct sshbuf *principals = NULL; u_char *ca_blob = NULL, *sig_blob = NULL, nonce[32]; @@ -2414,7 +2414,7 @@ sshkey_certify(struct sshkey *k, struct sshkey *ca) /* Sign the whole mess */ if ((ret = sshkey_sign(ca, &sig_blob, &sig_len, sshbuf_ptr(cert), - sshbuf_len(cert), NULL, 0)) != 0) + sshbuf_len(cert), alg, 0)) != 0) goto out; /* Append signature and we are done */ |