diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-07-01 13:50:45 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-07-21 14:17:32 +1000 |
commit | 83fa3a044891887369ce8b487ce88d713a04df48 (patch) | |
tree | f5d227629414d0a30ef14141a5613ed31fd1985c /sshkey.h | |
parent | 738c73dca2c99ee78c531b4cbeefc2008fe438f0 (diff) |
upstream commit
remove post-SSHv1 removal dead code from rsa.c and merge
the remaining bit that it still used into ssh-rsa.c; ok markus
Upstream-ID: ac8a048d24dcd89594b0052ea5e3404b473bfa2f
Diffstat (limited to 'sshkey.h')
-rw-r--r-- | sshkey.h | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.h,v 1.20 2017/06/28 01:09:22 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.h,v 1.21 2017/07/01 13:50:45 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. |
@@ -196,6 +196,9 @@ int sshkey_parse_private_fileblob(struct sshbuf *buffer, | |||
196 | int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type, | 196 | int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type, |
197 | const char *passphrase, struct sshkey **keyp, char **commentp); | 197 | const char *passphrase, struct sshkey **keyp, char **commentp); |
198 | 198 | ||
199 | /* XXX should be internal, but used by ssh-keygen */ | ||
200 | int ssh_rsa_generate_additional_parameters(struct sshkey *); | ||
201 | |||
199 | #ifdef SSHKEY_INTERNAL | 202 | #ifdef SSHKEY_INTERNAL |
200 | int ssh_rsa_sign(const struct sshkey *key, | 203 | int ssh_rsa_sign(const struct sshkey *key, |
201 | u_char **sigp, size_t *lenp, const u_char *data, size_t datalen, | 204 | u_char **sigp, size_t *lenp, const u_char *data, size_t datalen, |