diff options
Diffstat (limited to 'sshkey.h')
-rw-r--r-- | sshkey.h | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -39,6 +39,7 @@ | |||
39 | # define EC_POINT void | 39 | # define EC_POINT void |
40 | # endif /* OPENSSL_HAS_ECC */ | 40 | # endif /* OPENSSL_HAS_ECC */ |
41 | #else /* WITH_OPENSSL */ | 41 | #else /* WITH_OPENSSL */ |
42 | # define BIGNUM void | ||
42 | # define RSA void | 43 | # define RSA void |
43 | # define DSA void | 44 | # define DSA void |
44 | # define EC_KEY void | 45 | # define EC_KEY void |
@@ -127,10 +128,8 @@ struct sshkey { | |||
127 | #define ED25519_PK_SZ crypto_sign_ed25519_PUBLICKEYBYTES | 128 | #define ED25519_PK_SZ crypto_sign_ed25519_PUBLICKEYBYTES |
128 | 129 | ||
129 | struct sshkey *sshkey_new(int); | 130 | struct sshkey *sshkey_new(int); |
130 | int sshkey_add_private(struct sshkey *); | 131 | struct sshkey *sshkey_new_private(int); /* XXX garbage collect */ |
131 | struct sshkey *sshkey_new_private(int); | ||
132 | void sshkey_free(struct sshkey *); | 132 | void sshkey_free(struct sshkey *); |
133 | int sshkey_demote(const struct sshkey *, struct sshkey **); | ||
134 | int sshkey_equal_public(const struct sshkey *, | 133 | int sshkey_equal_public(const struct sshkey *, |
135 | const struct sshkey *); | 134 | const struct sshkey *); |
136 | int sshkey_equal(const struct sshkey *, const struct sshkey *); | 135 | int sshkey_equal(const struct sshkey *, const struct sshkey *); |
@@ -220,7 +219,7 @@ int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type, | |||
220 | const char *passphrase, struct sshkey **keyp, char **commentp); | 219 | const char *passphrase, struct sshkey **keyp, char **commentp); |
221 | 220 | ||
222 | /* XXX should be internal, but used by ssh-keygen */ | 221 | /* XXX should be internal, but used by ssh-keygen */ |
223 | int ssh_rsa_generate_additional_parameters(struct sshkey *); | 222 | int ssh_rsa_complete_crt_parameters(struct sshkey *, const BIGNUM *); |
224 | 223 | ||
225 | /* stateful keys (e.g. XMSS) */ | 224 | /* stateful keys (e.g. XMSS) */ |
226 | #ifdef NO_ATTRIBUTE_ON_PROTOTYPE_ARGS | 225 | #ifdef NO_ATTRIBUTE_ON_PROTOTYPE_ARGS |