diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2018-09-15 11:44:06 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2018-09-15 11:44:06 +0200 |
| commit | cce8cbe0ed7d1ba3a575310e0b63c193326ae616 (patch) | |
| tree | 1ea2c886c3bec86da0b067ed55cf76c207f45c0b /sshkey.c | |
| parent | add futex(2) syscall to seccomp sandbox (diff) | |
| download | openssh-cce8cbe0ed7d1ba3a575310e0b63c193326ae616.tar.xz openssh-cce8cbe0ed7d1ba3a575310e0b63c193326ae616.zip | |
Fix openssl-1.1 fallout for --without-openssl.
ok djm@
Diffstat (limited to '')
| -rw-r--r-- | sshkey.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1863,12 +1863,14 @@ sshkey_from_private(const struct sshkey *k, struct sshkey **pkp) r = 0; out: sshkey_free(n); +#ifdef WITH_OPENSSL BN_clear_free(rsa_n_dup); BN_clear_free(rsa_e_dup); BN_clear_free(dsa_p_dup); BN_clear_free(dsa_q_dup); BN_clear_free(dsa_g_dup); BN_clear_free(dsa_pub_key_dup); +#endif return r; } @@ -1998,6 +2000,7 @@ cert_parse(struct sshbuf *b, struct sshkey *key, struct sshbuf *certbuf) return ret; } +#ifdef WITH_OPENSSL static int check_rsa_length(const RSA *rsa) { @@ -2008,6 +2011,7 @@ check_rsa_length(const RSA *rsa) return SSH_ERR_KEY_LENGTH; return 0; } +#endif static int sshkey_from_blob_internal(struct sshbuf *b, struct sshkey **keyp, |