upstream: add the missing WITH_OPENSSL ifdefs after the ED25519-SK
addition; ok djm@
OpenBSD-Commit-ID: a9545e1c273e506cf70e328cbb9d0129b6d62474
diff --git a/ssh-sk.c b/ssh-sk.c
index 187d9f0..df2f040 100644
--- a/ssh-sk.c
+++ b/ssh-sk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-sk.c,v 1.14 2019/11/16 23:17:20 djm Exp $ */
+/* $OpenBSD: ssh-sk.c,v 1.15 2019/11/18 16:08:57 naddy Exp $ */
/*
* Copyright (c) 2019 Google LLC
*
@@ -27,8 +27,10 @@
#include <string.h>
#include <stdio.h>
+#ifdef WITH_OPENSSL
#include <openssl/objects.h>
#include <openssl/ec.h>
+#endif /* WITH_OPENSSL */
#include "log.h"
#include "misc.h"
@@ -163,6 +165,7 @@
freezero(r, sizeof(*r));
};
+#ifdef WITH_OPENSSL
/* Assemble key from response */
static int
sshsk_ecdsa_assemble(struct sk_enroll_response *resp, struct sshkey **keyp)
@@ -217,6 +220,7 @@
sshbuf_free(b);
return r;
}
+#endif /* WITH_OPENSSL */
static int
sshsk_ed25519_assemble(struct sk_enroll_response *resp, struct sshkey **keyp)
@@ -272,9 +276,11 @@
if (attest)
sshbuf_reset(attest);
switch (type) {
+#ifdef WITH_OPENSSL
case KEY_ECDSA_SK:
alg = SSH_SK_ECDSA;
break;
+#endif /* WITH_OPENSSL */
case KEY_ED25519_SK:
alg = SSH_SK_ED25519;
break;
@@ -330,10 +336,12 @@
goto out;
}
switch (type) {
+#ifdef WITH_OPENSSL
case KEY_ECDSA_SK:
if ((r = sshsk_ecdsa_assemble(resp, &key)) != 0)
goto out;
break;
+#endif /* WITH_OPENSSL */
case KEY_ED25519_SK:
if ((r = sshsk_ed25519_assemble(resp, &key)) != 0)
goto out;
@@ -382,6 +390,7 @@
return r;
}
+#ifdef WITH_OPENSSL
static int
sshsk_ecdsa_sig(struct sk_sign_response *resp, struct sshbuf *sig)
{
@@ -425,6 +434,7 @@
sshbuf_free(inner_sig);
return r;
}
+#endif /* WITH_OPENSSL */
static int
sshsk_ed25519_sig(struct sk_sign_response *resp, struct sshbuf *sig)
@@ -474,9 +484,11 @@
*lenp = 0;
type = sshkey_type_plain(key->type);
switch (type) {
+#ifdef WITH_OPENSSL
case KEY_ECDSA_SK:
alg = SSH_SK_ECDSA;
break;
+#endif /* WITH_OPENSSL */
case KEY_ED25519_SK:
alg = SSH_SK_ED25519;
break;
@@ -518,10 +530,12 @@
goto out;
}
switch (type) {
+#ifdef WITH_OPENSSL
case KEY_ECDSA_SK:
if ((r = sshsk_ecdsa_sig(resp, sig)) != 0)
goto out;
break;
+#endif /* WITH_OPENSSL */
case KEY_ED25519_SK:
if ((r = sshsk_ed25519_sig(resp, sig)) != 0)
goto out;