[openssh-commits] [openssh] branch master updated: more OPENSSL_HAS_ECC

git+noreply at mindrot.org git+noreply at mindrot.org
Fri Aug 16 08:30:27 AEST 2024


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

djm pushed a commit to branch master
in repository openssh.

The following commit(s) were added to refs/heads/master by this push:
     new a1385637 more OPENSSL_HAS_ECC
a1385637 is described below

commit a13856374b894397a7682b32257ed0bf67cfede9
Author: Damien Miller <djm at mindrot.org>
AuthorDate: Fri Aug 16 08:30:20 2024 +1000

    more OPENSSL_HAS_ECC
---
 ssh-pkcs11-helper.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c
index 9e1a0ab7..a8154f21 100644
--- a/ssh-pkcs11-helper.c
+++ b/ssh-pkcs11-helper.c
@@ -193,8 +193,12 @@ process_sign(void)
 	int len, r, ok = -1;
 	struct sshkey *key = NULL, *found;
 	struct sshbuf *msg;
+#ifdef WITH_OPENSSL
 	RSA *rsa = NULL;
+#ifdef OPENSSL_HAS_ECC
 	EC_KEY *ecdsa = NULL;
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
 	/* XXX support SHA2 signature flags */
 	if ((r = sshbuf_get_string(iqueue, &blob, &blen)) != 0 ||
@@ -257,7 +261,9 @@ process_sign(void)
 	}
 	sshkey_free(key);
 	RSA_free(rsa);
+#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
 	EC_KEY_free(ecdsa);
+#endif
 	free(data);
 	free(blob);
 	free(signature);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list