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

1 files changed, 3 insertions, 4 deletions

diff --git a/sshkey.h b/sshkey.h
index 5a22a66f5..4147ad92b 100644
--- a/sshkey.h
+++ b/sshkey.h
@@ -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