RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wrap ECC specific bits in ifdef. 

Fixes tests when built against an OpenSSL configured with no-ec.
This commit is contained in:
Darren Tucker 2019-12-06 14:17:26 +11:00
parent 2ff822eabd
commit fa7924008e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
regress/misc/sk-dummy/sk-dummy.c
View File

@ -115,6 +115,7 @@ sk_api_version(void)
static int static int
pack_key_ecdsa(struct sk_enroll_response *response) pack_key_ecdsa(struct sk_enroll_response *response)
{ {
#ifdef OPENSSL_HAS_ECC
EC_KEY *key = NULL; EC_KEY *key = NULL;
const EC_GROUP *g; const EC_GROUP *g;
const EC_POINT *q; const EC_POINT *q;
@ -194,6 +195,9 @@ pack_key_ecdsa(struct sk_enroll_response *response)
BIO_free(bio); BIO_free(bio);
EC_KEY_free(key); EC_KEY_free(key);
return ret; return ret;
#else
return -1;
#endif
} }
static int static int
@ -310,6 +314,7 @@ sig_ecdsa(const uint8_t *message, size_t message_len,
const uint8_t *key_handle, size_t key_handle_len, const uint8_t *key_handle, size_t key_handle_len,
struct sk_sign_response *response) struct sk_sign_response *response)
{ {
#ifdef OPENSSL_HAS_ECC
ECDSA_SIG *sig = NULL; ECDSA_SIG *sig = NULL;
const BIGNUM *sig_r, *sig_s; const BIGNUM *sig_r, *sig_s;
int ret = -1; int ret = -1;
@ -394,6 +399,9 @@ sig_ecdsa(const uint8_t *message, size_t message_len,
EC_KEY_free(ec); EC_KEY_free(ec);
EVP_PKEY_free(pk); EVP_PKEY_free(pk);
return ret; return ret;
#else
return -1;
#endif
} }
static int static int