diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2007-01-11 03:04:55 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2007-01-11 03:04:55 +0000 |
| commit | 7f0dd15bab8451fcea6eb1032ccbb13f4185d654 (patch) | |
| tree | 71737477e29ac976f50e45d4869c69928e2a459b | |
| parent | 28ad393b008b34bc3cdbaa192440b8cc615329f0 (diff) | |
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
--HG--
branch : libtomcrypt-dropbear
extra : convert_revision : ffd1015238ffcc959f6cd95176d96fcd0945a397
| -rw-r--r-- | src/headers/tomcrypt_custom.h | 9 | ||||
| -rw-r--r-- | src/headers/tomcrypt_math.h | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/headers/tomcrypt_custom.h b/src/headers/tomcrypt_custom.h index 540514e..4bf668f 100644 --- a/src/headers/tomcrypt_custom.h +++ b/src/headers/tomcrypt_custom.h @@ -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) */ diff --git a/src/headers/tomcrypt_math.h b/src/headers/tomcrypt_math.h index c996e41..8bf544f 100644 --- a/src/headers/tomcrypt_math.h +++ b/src/headers/tomcrypt_math.h @@ -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 @@ typedef struct { 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 @@ typedef struct { 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; |