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 | d277f140ba37472640c63cae4ce2dafa4799ddfc (patch) | |
| tree | 54c3b1ee46efbc8fe11222ce2853a64688a269c6 /sysoptions.h | |
| parent | 61267f85035c0c77059992f50ef20f62e192ba04 (diff) | |
| parent | c917807b1c89b93b317d56ce2905b5d6d6468a11 (diff) | |
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 |