diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2020-05-26 00:24:02 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2020-05-26 00:24:02 +0800 |
| commit | ffa4f43fd6a3dfe36457263132d7a109b644aeb4 (patch) | |
| tree | dad89ed65eaa7aa5605a54188ac14ca27092d609 /sysoptions.h | |
| parent | 98c8392454154d33c08144e91432b690c939021d (diff) | |
| parent | 5a2225370446cc90746c98acf71a9ad888ce7a5c (diff) | |
| download | dropbear-ffa4f43fd6a3dfe36457263132d7a109b644aeb4.tar.gz | |
merge rsa-sha256
Diffstat (limited to 'sysoptions.h')
| -rw-r--r-- | sysoptions.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sysoptions.h b/sysoptions.h index 2cfdef2..f0d6891 100644 --- a/sysoptions.h +++ b/sysoptions.h @@ -143,9 +143,17 @@ If you test it please contact the Dropbear author */ * signing operations slightly slower. */ #define DROPBEAR_RSA_BLINDING 1 +#ifndef DROPBEAR_RSA_SHA1 +#define DROPBEAR_RSA_SHA1 DROPBEAR_RSA +#endif +#ifndef DROPBEAR_RSA_SHA256 +#define DROPBEAR_RSA_SHA256 DROPBEAR_RSA +#endif + /* hashes which will be linked and registered */ -#define DROPBEAR_SHA256 ((DROPBEAR_SHA2_256_HMAC) || (DROPBEAR_ECC_256) \ - || (DROPBEAR_CURVE25519) || (DROPBEAR_DH_GROUP14_SHA256)) +#define DROPBEAR_SHA256 ((DROPBEAR_SHA2_256_HMAC) || (DROPBEAR_ECC_256) \ + || (DROPBEAR_CURVE25519) || (DROPBEAR_DH_GROUP14_SHA256) \ + || (DROPBEAR_RSA_SHA256)) #define DROPBEAR_SHA384 (DROPBEAR_ECC_384) /* LTC SHA384 depends on SHA512 */ #define DROPBEAR_SHA512 ((DROPBEAR_SHA2_512_HMAC) || (DROPBEAR_ECC_521) \ @@ -157,6 +165,10 @@ If you test it please contact the Dropbear author */ #define DROPBEAR_NORMAL_DH ((DROPBEAR_DH_GROUP1) || (DROPBEAR_DH_GROUP14) || (DROPBEAR_DH_GROUP16)) +/* Dropbear only uses server-sig-algs, only needed if we have rsa-sha256 pubkey auth */ +#define DROPBEAR_EXT_INFO ((DROPBEAR_RSA_SHA256) \ + && ((DROPBEAR_CLI_PUBKEY_AUTH) || (DROPBEAR_SVR_PUBKEY_AUTH))) + /* roughly 2x 521 bits */ #define MAX_ECC_SIZE 140 |