diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-12-18 02:25:15 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-12-19 15:21:37 +1100 |
commit | 04c7e28f83062dc42f2380d1bb3a6bf0190852c0 (patch) | |
tree | bc2c59d39a33aba84e0576039474668ada2546d2 /sshkey.h | |
parent | 931c78dfd7fe30669681a59e536bbe66535f3ee9 (diff) |
upstream commit
pass negotiated signing algorithm though to
sshkey_verify() and check that the negotiated algorithm matches the type in
the signature (only matters for RSA SHA1/SHA2 sigs). ok markus@
OpenBSD-Commit-ID: 735fb15bf4adc060d3bee9d047a4bcaaa81b1af9
Diffstat (limited to 'sshkey.h')
-rw-r--r-- | sshkey.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.h,v 1.22 2017/12/18 02:22:29 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.h,v 1.23 2017/12/18 02:25:15 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -178,7 +178,7 @@ int sshkey_sigtype(const u_char *, size_t, char **); | |||
178 | int sshkey_sign(const struct sshkey *, u_char **, size_t *, | 178 | int sshkey_sign(const struct sshkey *, u_char **, size_t *, |
179 | const u_char *, size_t, const char *, u_int); | 179 | const u_char *, size_t, const char *, u_int); |
180 | int sshkey_verify(const struct sshkey *, const u_char *, size_t, | 180 | int sshkey_verify(const struct sshkey *, const u_char *, size_t, |
181 | const u_char *, size_t, u_int); | 181 | const u_char *, size_t, const char *, u_int); |
182 | 182 | ||
183 | /* for debug */ | 183 | /* for debug */ |
184 | void sshkey_dump_ec_point(const EC_GROUP *, const EC_POINT *); | 184 | void sshkey_dump_ec_point(const EC_GROUP *, const EC_POINT *); |
@@ -205,7 +205,8 @@ int ssh_rsa_sign(const struct sshkey *key, | |||
205 | u_char **sigp, size_t *lenp, const u_char *data, size_t datalen, | 205 | u_char **sigp, size_t *lenp, const u_char *data, size_t datalen, |
206 | const char *ident); | 206 | const char *ident); |
207 | int ssh_rsa_verify(const struct sshkey *key, | 207 | int ssh_rsa_verify(const struct sshkey *key, |
208 | const u_char *sig, size_t siglen, const u_char *data, size_t datalen); | 208 | const u_char *sig, size_t siglen, const u_char *data, size_t datalen, |
209 | const char *alg); | ||
209 | int ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, | 210 | int ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, |
210 | const u_char *data, size_t datalen, u_int compat); | 211 | const u_char *data, size_t datalen, u_int compat); |
211 | int ssh_dss_verify(const struct sshkey *key, | 212 | int ssh_dss_verify(const struct sshkey *key, |