The unified diff between revisions [2af22fb4..] and [ffd10152..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "src/headers/tomcrypt_custom.h"
# from [1f16949adca64b0d2894f2fbe6588264ee0415ad]
# to [7bf775b078853de3936566958ee144011d06fb2c]
#
# patch "src/headers/tomcrypt_math.h"
# from [8e8544725452d7c0a4f36c571df13750d4c6fa9d]
# to [1c8a27d066b0c11dbb7d08fa73d6194a86e95e61]
#
============================================================
--- src/headers/tomcrypt_custom.h 1f16949adca64b0d2894f2fbe6588264ee0415ad
+++ src/headers/tomcrypt_custom.h 7bf775b078853de3936566958ee144011d06fb2c
@@ -111,8 +111,9 @@
#ifdef DROPBEAR_3DES_CBC
#define DES
#endif
-#define CBC
+#define LTC_CBC_MODE
+
#if defined(DROPBEAR_DSS) && defined(DSS_PROTOK)
#define SHA512
#endif
@@ -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) */
============================================================
--- src/headers/tomcrypt_math.h 8e8544725452d7c0a4f36c571df13750d4c6fa9d
+++ src/headers/tomcrypt_math.h 1c8a27d066b0c11dbb7d08fa73d6194a86e95e61
@@ -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;