diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2013-03-20 22:41:07 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2013-03-20 22:41:07 +0800 |
| commit | d37dcc636f6d7832b969aa94d2446894cd44a680 (patch) | |
| tree | 917127ae7dfacb4f592af43f4b10631a1ebf3dc3 /libtomcrypt/src | |
| parent | 804a1e69f2e34fe55ffa76c1ac4b8ce928011497 (diff) | |
| parent | e719a9ef6f1cab28c075cb733d2f864dbe0b5c9b (diff) | |
Merge "none" cipher/MAC branch. Also adds sha256 and sha512
Diffstat (limited to 'libtomcrypt/src')
| -rw-r--r-- | libtomcrypt/src/headers/tomcrypt_custom.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libtomcrypt/src/headers/tomcrypt_custom.h b/libtomcrypt/src/headers/tomcrypt_custom.h index 12bdb7f..acc149a 100644 --- a/libtomcrypt/src/headers/tomcrypt_custom.h +++ b/libtomcrypt/src/headers/tomcrypt_custom.h @@ -118,16 +118,20 @@ #define LTC_CTR_MODE #endif -#if defined(DROPBEAR_DSS) && defined(DSS_PROTOK) -#define SHA512 -#endif - #define SHA1 -#ifdef DROPBEAR_MD5_HMAC +#ifdef DROPBEAR_MD5 #define MD5 #endif +#ifdef DROPBEAR_SHA256 +#define SHA256 +#endif + +#ifdef DROPBEAR_SHA512 +#define SHA512 +#endif + #define LTC_HMAC /* Various tidbits of modern neatoness */ |