Mercurial > dropbear

comparison sysoptions.h @ 1659:d32bcb5c557d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add Ed25519 support (#91) * Add support for Ed25519 as a public key type Ed25519 is a elliptic curve signature scheme that offers better security than ECDSA and DSA and good performance. It may be used for both user and host keys. OpenSSH key import and fuzzer are not supported yet. Initially inspired by Peter Szabo. * Add curve25519 and ed25519 fuzzers * Add import and export of Ed25519 keys
author Vladislav Grishenko <themiron@users.noreply.github.com>
date Wed, 11 Mar 2020 21:09:45 +0500
parents cc0fc5131c5c
children 3a97f14c0235 ba6fc7afe1c5
comparison
equal deleted inserted replaced
1658:7402218141d4 1659:d32bcb5c557d
143 #define DROPBEAR_SHA256 ((DROPBEAR_SHA2_256_HMAC) || (DROPBEAR_ECC_256) \ 143 #define DROPBEAR_SHA256 ((DROPBEAR_SHA2_256_HMAC) || (DROPBEAR_ECC_256) \
144 || (DROPBEAR_CURVE25519) || (DROPBEAR_DH_GROUP14_SHA256)) 144 || (DROPBEAR_CURVE25519) || (DROPBEAR_DH_GROUP14_SHA256))
145 #define DROPBEAR_SHA384 (DROPBEAR_ECC_384) 145 #define DROPBEAR_SHA384 (DROPBEAR_ECC_384)
146 /* LTC SHA384 depends on SHA512 */ 146 /* LTC SHA384 depends on SHA512 */
147 #define DROPBEAR_SHA512 ((DROPBEAR_SHA2_512_HMAC) || (DROPBEAR_ECC_521) \ 147 #define DROPBEAR_SHA512 ((DROPBEAR_SHA2_512_HMAC) || (DROPBEAR_ECC_521) \
148 || (DROPBEAR_SHA384) || (DROPBEAR_DH_GROUP16)) 148 || (DROPBEAR_SHA384) || (DROPBEAR_DH_GROUP16) \
149 || (DROPBEAR_ED25519))
149 #define DROPBEAR_MD5 (DROPBEAR_MD5_HMAC) 150 #define DROPBEAR_MD5 (DROPBEAR_MD5_HMAC)
150 151
151 #define DROPBEAR_DH_GROUP14 ((DROPBEAR_DH_GROUP14_SHA256) || (DROPBEAR_DH_GROUP14_SHA1)) 152 #define DROPBEAR_DH_GROUP14 ((DROPBEAR_DH_GROUP14_SHA256) || (DROPBEAR_DH_GROUP14_SHA1))
152 153
153 #define DROPBEAR_NORMAL_DH ((DROPBEAR_DH_GROUP1) || (DROPBEAR_DH_GROUP14) || (DROPBEAR_DH_GROUP16)) 154 #define DROPBEAR_NORMAL_DH ((DROPBEAR_DH_GROUP1) || (DROPBEAR_DH_GROUP14) || (DROPBEAR_DH_GROUP16))
184 /* For a 4096 bit DSS key, empirically determined */ 185 /* For a 4096 bit DSS key, empirically determined */
185 #define MAX_PUBKEY_SIZE 1700 186 #define MAX_PUBKEY_SIZE 1700
186 /* For a 4096 bit DSS key, empirically determined */ 187 /* For a 4096 bit DSS key, empirically determined */
187 #define MAX_PRIVKEY_SIZE 1700 188 #define MAX_PRIVKEY_SIZE 1700
188 189
189 #define MAX_HOSTKEYS 3 190 #define MAX_HOSTKEYS 4
190 191
191 /* The maximum size of the bignum portion of the kexhash buffer */ 192 /* The maximum size of the bignum portion of the kexhash buffer */
192 /* Sect. 8 of the transport rfc 4253, K_S + e + f + K */ 193 /* Sect. 8 of the transport rfc 4253, K_S + e + f + K */
193 #define KEXHASHBUF_MAX_INTS (1700 + 130 + 130 + 130) 194 #define KEXHASHBUF_MAX_INTS (1700 + 130 + 130 + 130)
194 195
250 #if !(DROPBEAR_AES128 || DROPBEAR_3DES || DROPBEAR_AES256 || DROPBEAR_BLOWFISH \ 251 #if !(DROPBEAR_AES128 || DROPBEAR_3DES || DROPBEAR_AES256 || DROPBEAR_BLOWFISH \
251 || DROPBEAR_TWOFISH256 || DROPBEAR_TWOFISH128) 252 || DROPBEAR_TWOFISH256 || DROPBEAR_TWOFISH128)
252 #error "At least one encryption algorithm must be enabled. AES128 is recommended." 253 #error "At least one encryption algorithm must be enabled. AES128 is recommended."
253 #endif 254 #endif
254 255
255 #if !(DROPBEAR_RSA || DROPBEAR_DSS || DROPBEAR_ECDSA) 256 #if !(DROPBEAR_RSA || DROPBEAR_DSS || DROPBEAR_ECDSA || DROPBEAR_ED25519)
256 #error "At least one hostkey or public-key algorithm must be enabled; RSA is recommended." 257 #error "At least one hostkey or public-key algorithm must be enabled; RSA is recommended."
257 #endif 258 #endif
258 259
259 /* Source for randomness. This must be able to provide hundreds of bytes per SSH 260 /* Source for randomness. This must be able to provide hundreds of bytes per SSH
260 * connection without blocking. */ 261 * connection without blocking. */