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 /sshkey.h | |
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 'sshkey.h')
-rw-r--r-- | sshkey.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.h,v 1.11 2015/11/19 01:08:55 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.h,v 1.12 2015/12/04 16:41:28 markus 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. |
@@ -169,7 +169,7 @@ int sshkey_plain_to_blob(const struct sshkey *, u_char **, size_t *); | |||
169 | int sshkey_putb_plain(const struct sshkey *, struct sshbuf *); | 169 | int sshkey_putb_plain(const struct sshkey *, struct sshbuf *); |
170 | 170 | ||
171 | int sshkey_sign(const struct sshkey *, u_char **, size_t *, | 171 | int sshkey_sign(const struct sshkey *, u_char **, size_t *, |
172 | const u_char *, size_t, u_int); | 172 | const u_char *, size_t, const char *, u_int); |
173 | int sshkey_verify(const struct sshkey *, const u_char *, size_t, | 173 | int sshkey_verify(const struct sshkey *, const u_char *, size_t, |
174 | const u_char *, size_t, u_int); | 174 | const u_char *, size_t, u_int); |
175 | 175 | ||
@@ -193,11 +193,11 @@ int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type, | |||
193 | const char *passphrase, struct sshkey **keyp, char **commentp); | 193 | const char *passphrase, struct sshkey **keyp, char **commentp); |
194 | 194 | ||
195 | #ifdef SSHKEY_INTERNAL | 195 | #ifdef SSHKEY_INTERNAL |
196 | int ssh_rsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, | 196 | int ssh_rsa_sign(const struct sshkey *key, |
197 | const u_char *data, size_t datalen, u_int compat); | 197 | u_char **sigp, size_t *lenp, const u_char *data, size_t datalen, |
198 | const char *ident); | ||
198 | int ssh_rsa_verify(const struct sshkey *key, | 199 | int ssh_rsa_verify(const struct sshkey *key, |
199 | const u_char *signature, size_t signaturelen, | 200 | const u_char *sig, size_t siglen, const u_char *data, size_t datalen); |
200 | const u_char *data, size_t datalen, u_int compat); | ||
201 | int ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, | 201 | int ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, |
202 | const u_char *data, size_t datalen, u_int compat); | 202 | const u_char *data, size_t datalen, u_int compat); |
203 | int ssh_dss_verify(const struct sshkey *key, | 203 | int ssh_dss_verify(const struct sshkey *key, |