Mercurial > dropbear
changeset 383:2c89a3a04104 libtomcrypt-dropbear
Fix up some slight changes.
Hack out the RSA code in tomcrypt_math.h fairly crudely, as LTC's rsa_key
collide's with Dropbear's rsa_key
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Thu, 11 Jan 2007 03:04:55 +0000 |
| parents | 999a5eb4ed10 |
| children | a05fb340a95d d8e44bef7917 |
| files | src/headers/tomcrypt_custom.h src/headers/tomcrypt_math.h |
| diffstat | 2 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/headers/tomcrypt_custom.h Thu Jan 11 02:39:21 2007 +0000 +++ b/src/headers/tomcrypt_custom.h Thu Jan 11 03:04:55 2007 +0000 @@ -111,7 +111,8 @@ #ifdef DROPBEAR_3DES_CBC #define DES #endif -#define CBC + +#define LTC_CBC_MODE #if defined(DROPBEAR_DSS) && defined(DSS_PROTOK) #define SHA512 @@ -123,12 +124,12 @@ #define MD5 #endif -#define HMAC +#define LTC_HMAC /* Various tidbits of modern neatoness */ #define BASE64 -/* default no functions */ +/* default no pthread functions */ #define LTC_MUTEX_GLOBAL(x) #define LTC_MUTEX_PROTO(x) #define LTC_MUTEX_TYPE(x) @@ -137,8 +138,6 @@ #define LTC_MUTEX_UNLOCK(x) #define FORTUNA_POOLS 0 -#endif - /* Debuggers */ /* define this if you use Valgrind, note: it CHANGES the way SOBER-128 and RC4 work (see the code) */
--- a/src/headers/tomcrypt_math.h Thu Jan 11 02:39:21 2007 +0000 +++ b/src/headers/tomcrypt_math.h Thu Jan 11 03:04:55 2007 +0000 @@ -11,9 +11,12 @@ typedef void ecc_point; #endif +/* Dropbear has its own rsa_key. We just comment this out. */ +#if 0 #ifndef MRSA typedef void rsa_key; #endif +#endif /** math descriptor */ typedef struct { @@ -386,6 +389,8 @@ ecc_point *C, void *modulus); +/* Dropbear has its own rsa code */ +#if 0 /* ---- (optional) rsa optimized math (for internal CRT) ---- */ /** RSA Key Generation @@ -411,6 +416,7 @@ int (*rsa_me)(const unsigned char *in, unsigned long inlen, unsigned char *out, unsigned long *outlen, int which, rsa_key *key); +#endif } ltc_math_descriptor; extern ltc_math_descriptor ltc_mp;