Mailing List Archive

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit cce8cbe0ed7d1ba3a575310e0b63c193326ae616
Author: Darren Tucker <dtucker@dtucker.net>
Date: Sat Sep 15 19:44:06 2018 +1000

Fix openssl-1.1 fallout for --without-openssl.

ok djm@
---
sshkey.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/sshkey.c b/sshkey.c
index 4bd975ce..63c01ea6 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -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,

--
To stop receiving notification emails like this one, please contact
djm@mindrot.org.
_______________________________________________
openssh-commits mailing list
openssh-commits@mindrot.org
https://lists.mindrot.org/mailman/listinfo/openssh-commits