Mercurial > dropbear
comparison algo.h @ 1295:750ec4ec4cbe
Convert #ifdef to #if, other build changes
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Wed, 04 May 2016 15:33:40 +0200 |
parents | 56aba7dedbea |
children | 06d52bcb8094 |
comparison
equal
deleted
inserted
replaced
1294:56aba7dedbea | 1295:750ec4ec4cbe |
---|---|
84 | 84 |
85 enum dropbear_kex_mode { | 85 enum dropbear_kex_mode { |
86 #if DROPBEAR_NORMAL_DH | 86 #if DROPBEAR_NORMAL_DH |
87 DROPBEAR_KEX_NORMAL_DH, | 87 DROPBEAR_KEX_NORMAL_DH, |
88 #endif | 88 #endif |
89 #ifdef DROPBEAR_ECDH | 89 #if DROPBEAR_ECDH |
90 DROPBEAR_KEX_ECDH, | 90 DROPBEAR_KEX_ECDH, |
91 #endif | 91 #endif |
92 #ifdef DROPBEAR_CURVE25519 | 92 #if DROPBEAR_CURVE25519 |
93 DROPBEAR_KEX_CURVE25519, | 93 DROPBEAR_KEX_CURVE25519, |
94 #endif | 94 #endif |
95 }; | 95 }; |
96 | 96 |
97 struct dropbear_kex { | 97 struct dropbear_kex { |
100 /* "normal" DH KEX */ | 100 /* "normal" DH KEX */ |
101 const unsigned char *dh_p_bytes; | 101 const unsigned char *dh_p_bytes; |
102 const int dh_p_len; | 102 const int dh_p_len; |
103 | 103 |
104 /* elliptic curve DH KEX */ | 104 /* elliptic curve DH KEX */ |
105 #ifdef DROPBEAR_ECDH | 105 #if DROPBEAR_ECDH |
106 const struct dropbear_ecc_curve *ecc_curve; | 106 const struct dropbear_ecc_curve *ecc_curve; |
107 #else | 107 #else |
108 const void* dummy; | 108 const void* dummy; |
109 #endif | 109 #endif |
110 | 110 |
126 | 126 |
127 | 127 |
128 algo_type * buf_match_algo(buffer* buf, algo_type localalgos[], | 128 algo_type * buf_match_algo(buffer* buf, algo_type localalgos[], |
129 enum kexguess2_used *kexguess2, int *goodguess); | 129 enum kexguess2_used *kexguess2, int *goodguess); |
130 | 130 |
131 #ifdef ENABLE_USER_ALGO_LIST | 131 #if DROPBEAR_USER_ALGO_LIST |
132 int check_user_algos(const char* user_algo_list, algo_type * algos, | 132 int check_user_algos(const char* user_algo_list, algo_type * algos, |
133 const char *algo_desc); | 133 const char *algo_desc); |
134 char * algolist_string(algo_type algos[]); | 134 char * algolist_string(algo_type algos[]); |
135 #endif | 135 #endif |
136 | 136 |