diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2016-05-04 15:33:40 +0200 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2016-05-04 15:33:40 +0200 |
| commit | 32a28d0d9cf7c567671366d6ec71df87627e2c49 (patch) | |
| tree | eed0f72ed707d62a28b4cb1d8da05c5d1b3f23c3 /common-kex.c | |
| parent | d6daad29fcfc20295473bf7e6a96f3016282e9e6 (diff) | |
Convert #ifdef to #if, other build changes
Diffstat (limited to 'common-kex.c')
| -rw-r--r-- | common-kex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common-kex.c b/common-kex.c index 5003d2f..072b6fb 100644 --- a/common-kex.c +++ b/common-kex.c @@ -640,7 +640,7 @@ void kexdh_comb_key(struct kex_dh_param *param, mp_int *dh_pub_them, finish_kexhashbuf(); } -#ifdef DROPBEAR_ECDH +#if DROPBEAR_ECDH struct kex_ecdh_param *gen_kexecdh_param() { struct kex_ecdh_param *param = m_malloc(sizeof(*param)); if (ecc_make_key_ex(NULL, dropbear_ltc_prng, @@ -692,7 +692,7 @@ void kexecdh_comb_key(struct kex_ecdh_param *param, buffer *pub_them, } #endif /* DROPBEAR_ECDH */ -#ifdef DROPBEAR_CURVE25519 +#if DROPBEAR_CURVE25519 struct kex_curve25519_param *gen_kexcurve25519_param () { /* Per http://cr.yp.to/ecdh.html */ struct kex_curve25519_param *param = m_malloc(sizeof(*param)); @@ -774,7 +774,7 @@ static void finish_kexhashbuf(void) { hash_desc->done(&hs, buf_getwriteptr(ses.hash, hash_desc->hashsize)); buf_setlen(ses.hash, hash_desc->hashsize); -#if defined(DEBUG_KEXHASH) && defined(DEBUG_TRACE) +#if (DEBUG_KEXHASH) && (DEBUG_TRACE) if (!debug_trace) { printhex("kexhashbuf", ses.kexhashbuf->data, ses.kexhashbuf->len); printhex("kexhash", ses.hash->data, ses.hash->len); @@ -814,7 +814,7 @@ static void read_kex_algos() { int allgood = 1; /* we AND this with each goodguess and see if its still true after */ -#ifdef USE_KEXGUESS2 +#if DROPBEAR_KEXGUESS2 enum kexguess2_used kexguess2 = KEXGUESS2_LOOK; #else enum kexguess2_used kexguess2 = KEXGUESS2_NO; |