diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-09-13 04:08:33 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-09-13 04:12:33 +0200 |
| commit | 482d23bcacdd3664f21cc82a5135f66fc598275f (patch) | |
| tree | 362f697a94da0a765d1dabcfbf33370b2a4df121 /sshkey.h | |
| parent | upstream: Include certs with multiple RSA signature variants in (diff) | |
| download | openssh-482d23bcacdd3664f21cc82a5135f66fc598275f.tar.xz openssh-482d23bcacdd3664f21cc82a5135f66fc598275f.zip | |
upstream: hold our collective noses and use the openssl-1.1.x API in
OpenSSH; feedback and ok tb@ jsing@ markus@
OpenBSD-Commit-ID: cacbcac87ce5da0d3ca7ef1b38a6f7fb349e4417
Diffstat (limited to 'sshkey.h')
| -rw-r--r-- | sshkey.h | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -39,6 +39,7 @@ # define EC_POINT void # endif /* OPENSSL_HAS_ECC */ #else /* WITH_OPENSSL */ +# define BIGNUM void # define RSA void # define DSA void # define EC_KEY void @@ -127,10 +128,8 @@ struct sshkey { #define ED25519_PK_SZ crypto_sign_ed25519_PUBLICKEYBYTES struct sshkey *sshkey_new(int); -int sshkey_add_private(struct sshkey *); -struct sshkey *sshkey_new_private(int); +struct sshkey *sshkey_new_private(int); /* XXX garbage collect */ void sshkey_free(struct sshkey *); -int sshkey_demote(const struct sshkey *, struct sshkey **); int sshkey_equal_public(const struct sshkey *, const struct sshkey *); int sshkey_equal(const struct sshkey *, const struct sshkey *); @@ -220,7 +219,7 @@ int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type, const char *passphrase, struct sshkey **keyp, char **commentp); /* XXX should be internal, but used by ssh-keygen */ -int ssh_rsa_generate_additional_parameters(struct sshkey *); +int ssh_rsa_complete_crt_parameters(struct sshkey *, const BIGNUM *); /* stateful keys (e.g. XMSS) */ #ifdef NO_ATTRIBUTE_ON_PROTOTYPE_ARGS |