diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-03-10 05:07:20 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-03-10 05:35:39 +0100 |
| commit | 183ba55aaaecca0206184b854ad6155df237adbe (patch) | |
| tree | a62c9a5478a8a265d0adf044ccedb2d6b480f16e /sshkey.h | |
| parent | upstream commit (diff) | |
| download | openssh-183ba55aaaecca0206184b854ad6155df237adbe.tar.xz openssh-183ba55aaaecca0206184b854ad6155df237adbe.zip | |
upstream commit
fix regression in 7.4 server-sig-algs, where we were
accidentally excluding SHA2 RSA signature methods. bz#2680, patch from Nuno
Goncalves; ok dtucker@
Upstream-ID: 81ac8bfb30960447740b9b8f6a214dcf322f12e8
Diffstat (limited to '')
| -rw-r--r-- | sshkey.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.h,v 1.14 2016/09/12 23:31:27 djm Exp $ */ +/* $OpenBSD: sshkey.h,v 1.15 2017/03/10 04:07:20 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -156,7 +156,7 @@ int sshkey_ec_validate_private(const EC_KEY *); const char *sshkey_ssh_name(const struct sshkey *); const char *sshkey_ssh_name_plain(const struct sshkey *); int sshkey_names_valid2(const char *, int); -char *sshkey_alg_list(int, int, char); +char *sshkey_alg_list(int, int, int, char); int sshkey_from_blob(const u_char *, size_t, struct sshkey **); int sshkey_fromb(struct sshbuf *, struct sshkey **); |