diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ciphers/aes/aes.c | 2 | ||||
| -rw-r--r-- | src/ciphers/des.c | 12 | ||||
| -rw-r--r-- | src/ciphers/twofish/twofish.c | 2 | ||||
| -rw-r--r-- | src/headers/tomcrypt.h | 3 | ||||
| -rw-r--r-- | src/headers/tomcrypt_custom.h | 312 | ||||
| -rw-r--r-- | src/misc/crypt/crypt.c | 2 |
6 files changed, 51 insertions, 282 deletions
diff --git a/src/ciphers/aes/aes.c b/src/ciphers/aes/aes.c index bd2006d..74798e8 100644 --- a/src/ciphers/aes/aes.c +++ b/src/ciphers/aes/aes.c @@ -43,6 +43,7 @@ #define ECB_TEST rijndael_test #define ECB_KS rijndael_keysize +#if 0 const struct ltc_cipher_descriptor rijndael_desc = { "rijndael", @@ -51,6 +52,7 @@ const struct ltc_cipher_descriptor rijndael_desc = SETUP, ECB_ENC, ECB_DEC, ECB_TEST, ECB_DONE, ECB_KS, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; +#endif const struct ltc_cipher_descriptor aes_desc = { diff --git a/src/ciphers/des.c b/src/ciphers/des.c index 99a0b58..e505b14 100644 --- a/src/ciphers/des.c +++ b/src/ciphers/des.c @@ -20,6 +20,7 @@ #define EN0 0 #define DE1 1 +#if 0 const struct ltc_cipher_descriptor des_desc = { "des", @@ -33,6 +34,7 @@ const struct ltc_cipher_descriptor des_desc = &des_keysize, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; +#endif const struct ltc_cipher_descriptor des3_desc = { @@ -1518,6 +1520,7 @@ static void desfunc(ulong32 *block, const ulong32 *keys) } #endif +#if 0 /** Initialize the DES block cipher @param key The symmetric key you wish to pass @@ -1544,6 +1547,7 @@ int des_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_ke return CRYPT_OK; } +#endif /** Initialize the 3DES-EDE block cipher @@ -1577,6 +1581,7 @@ int des3_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_k return CRYPT_OK; } +#if 0 /** Encrypts a block of text with DES @param pt The input plaintext (8 bytes) @@ -1618,6 +1623,7 @@ int des_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *s STORE32H(work[1],pt+4); return CRYPT_OK; } +#endif /** Encrypts a block of text with 3DES-EDE @@ -1666,6 +1672,7 @@ int des3_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key * return CRYPT_OK; } +#if 0 /** Performs a self-test of the DES block cipher @return CRYPT_OK if functional, CRYPT_NOP if self-test has been disabled @@ -1812,6 +1819,7 @@ int des_test(void) return CRYPT_OK; #endif } +#endif int des3_test(void) { @@ -1849,12 +1857,14 @@ int des3_test(void) #endif } +#if 0 /** Terminate the context @param skey The scheduled key */ void des_done(symmetric_key *skey) { } +#endif /** Terminate the context @param skey The scheduled key @@ -1864,6 +1874,7 @@ void des3_done(symmetric_key *skey) } +#if 0 /** Gets suitable key size @param keysize [in/out] The length of the recommended key (in bytes). This function will store the suitable size back in this variable. @@ -1878,6 +1889,7 @@ int des_keysize(int *keysize) *keysize = 8; return CRYPT_OK; } +#endif /** Gets suitable key size diff --git a/src/ciphers/twofish/twofish.c b/src/ciphers/twofish/twofish.c index 5bee0b3..9e6d0d4 100644 --- a/src/ciphers/twofish/twofish.c +++ b/src/ciphers/twofish/twofish.c @@ -43,12 +43,14 @@ const struct ltc_cipher_descriptor twofish_desc = #define RS_POLY 0x14D /* The 4x4 MDS Linear Transform */ +#if 0 static const unsigned char MDS[4][4] = { { 0x01, 0xEF, 0x5B, 0x5B }, { 0x5B, 0xEF, 0xEF, 0x01 }, { 0xEF, 0x5B, 0x01, 0xEF }, { 0xEF, 0x01, 0xEF, 0x5B } }; +#endif /* The 4x8 RS Linear Transform */ static const unsigned char RS[4][8] = { diff --git a/src/headers/tomcrypt.h b/src/headers/tomcrypt.h index 5e127dc..15ccd04 100644 --- a/src/headers/tomcrypt.h +++ b/src/headers/tomcrypt.h @@ -23,7 +23,8 @@ extern "C" { #define MAXBLOCKSIZE 128 /* descriptor table size */ -#define TAB_SIZE 32 +/* Dropbear change - this should be smaller, saves some size */ +#define TAB_SIZE 4 /* error codes [will be expanded in future releases] */ enum { diff --git a/src/headers/tomcrypt_custom.h b/src/headers/tomcrypt_custom.h index e08bc92..540514e 100644 --- a/src/headers/tomcrypt_custom.h +++ b/src/headers/tomcrypt_custom.h @@ -1,6 +1,9 @@ #ifndef TOMCRYPT_CUSTOM_H_ #define TOMCRYPT_CUSTOM_H_ +/* this will sort out which stuff based on the user-config in options.h */ +#include "options.h" + /* macros for various libc functions you can change for embedded targets */ #ifndef XMALLOC #ifdef malloc @@ -59,56 +62,17 @@ #define XCLOCKS_PER_SEC CLOCKS_PER_SEC #endif -#ifndef XQSORT - #ifdef qsort - #define LTC_NO_PROTOTYPES - #endif -#define XQSORT qsort -#endif - -/* Easy button? */ -#ifdef LTC_EASY - #define LTC_NO_CIPHERS - #define RIJNDAEL - #define BLOWFISH - #define DES - #define CAST5 - - #define LTC_NO_MODES - #define LTC_ECB_MODE - #define LTC_CBC_MODE - #define LTC_CTR_MODE - - #define LTC_NO_HASHES - #define SHA1 - #define SHA512 - #define SHA384 - #define SHA256 - #define SHA224 - - #define LTC_NO_MACS - #define HMAC - #define OMAC - #define CCM_MODE - #define LTC_NO_PRNGS - #define SPRNG - #define YARROW - #define DEVRANDOM - #define TRY_URANDOM_FIRST - #define LTC_NO_PK - #define MRSA - #define MECC -#endif - -/* Use small code where possible */ -/* #define LTC_SMALL_CODE */ +#ifdef DROPBEAR_SMALL_CODE +#define LTC_SMALL_CODE +#endif +/* These spit out warnings etc */ +#define LTC_NO_ROLC /* Enable self-test test vector checking */ -#ifndef LTC_NO_TEST - #define LTC_TEST -#endif +/* Not for dropbear */ +//#define LTC_TEST /* clean the stack of functions which put private information on stack */ /* #define LTC_CLEAN_STACK */ @@ -125,260 +89,45 @@ /* disable BSWAP on x86 */ /* #define LTC_NO_BSWAP */ -/* ---> Symmetric Block Ciphers <--- */ -#ifndef LTC_NO_CIPHERS +#ifdef DROPBEAR_BLOWFISH_CBC #define BLOWFISH -#define RC2 -#define RC5 -#define RC6 -#define SAFERP -#define RIJNDAEL -#define XTEA -/* _TABLES tells it to use tables during setup, _SMALL means to use the smaller scheduled key format - * (saves 4KB of ram), _ALL_TABLES enables all tables during setup */ -#define TWOFISH -#ifndef LTC_NO_TABLES - #define TWOFISH_TABLES - /* #define TWOFISH_ALL_TABLES */ -#else - #define TWOFISH_SMALL #endif -/* #define TWOFISH_SMALL */ -/* DES includes EDE triple-DES */ -#define DES -#define CAST5 -#define NOEKEON -#define SKIPJACK -#define SAFER -#define KHAZAD -#define ANUBIS -#define ANUBIS_TWEAK -#define KSEED -#define LTC_KASUMI - -#endif /* LTC_NO_CIPHERS */ - - -/* ---> Block Cipher Modes of Operation <--- */ -#ifndef LTC_NO_MODES -#define LTC_CFB_MODE -#define LTC_OFB_MODE -#define LTC_ECB_MODE -#define LTC_CBC_MODE -#define LTC_CTR_MODE - -/* F8 chaining mode */ -#define LTC_F8_MODE - -/* LRW mode */ -#define LTC_LRW_MODE -#ifndef LTC_NO_TABLES - /* like GCM mode this will enable 16 8x128 tables [64KB] that make - * seeking very fast. - */ - #define LRW_TABLES +#ifdef DROPBEAR_AES_CBC +#define RIJNDAEL #endif -#endif /* LTC_NO_MODES */ - -/* ---> One-Way Hash Functions <--- */ -#ifndef LTC_NO_HASHES - -#define CHC_HASH -#define WHIRLPOOL -#define SHA512 -#define SHA384 -#define SHA256 -#define SHA224 -#define TIGER -#define SHA1 -#define MD5 -#define MD4 -#define MD2 -#define RIPEMD128 -#define RIPEMD160 -#define RIPEMD256 -#define RIPEMD320 - -#endif /* LTC_NO_HASHES */ - -/* ---> MAC functions <--- */ -#ifndef LTC_NO_MACS - -#define LTC_HMAC -#define LTC_OMAC -#define LTC_PMAC -#define LTC_XCBC -#define LTC_F9_MODE -#define PELICAN +#ifdef DROPBEAR_TWOFISH_CBC +#define TWOFISH -#if defined(PELICAN) && !defined(RIJNDAEL) - #error Pelican-MAC requires RIJNDAEL +/* enabling just TWOFISH_SMALL will make the binary ~1kB smaller, turning on + * TWOFISH_TABLES will make it a few kB bigger, but perhaps reduces runtime + * memory usage? */ +#define TWOFISH_SMALL +/*#define TWOFISH_TABLES*/ #endif -/* ---> Encrypt + Authenticate Modes <--- */ - -#define EAX_MODE -#if defined(EAX_MODE) && !(defined(LTC_CTR_MODE) && defined(LTC_OMAC)) - #error EAX_MODE requires CTR and OMAC mode +#ifdef DROPBEAR_3DES_CBC +#define DES #endif +#define CBC -#define OCB_MODE -#define CCM_MODE -#define GCM_MODE - -/* Use 64KiB tables */ -#ifndef LTC_NO_TABLES - #define GCM_TABLES +#if defined(DROPBEAR_DSS) && defined(DSS_PROTOK) +#define SHA512 #endif -/* USE SSE2? requires GCC works on x86_32 and x86_64*/ -#ifdef GCM_TABLES -/* #define GCM_TABLES_SSE2 */ +#define SHA1 + +#ifdef DROPBEAR_MD5_HMAC +#define MD5 #endif -#endif /* LTC_NO_MACS */ +#define HMAC /* Various tidbits of modern neatoness */ #define BASE64 -/* --> Pseudo Random Number Generators <--- */ -#ifndef LTC_NO_PRNGS - -/* Yarrow */ -#define YARROW -/* which descriptor of AES to use? */ -/* 0 = rijndael_enc 1 = aes_enc, 2 = rijndael [full], 3 = aes [full] */ -#define YARROW_AES 0 - -#if defined(YARROW) && !defined(LTC_CTR_MODE) - #error YARROW requires LTC_CTR_MODE chaining mode to be defined! -#endif - -/* a PRNG that simply reads from an available system source */ -#define SPRNG - -/* The RC4 stream cipher */ -#define RC4 - -/* Fortuna PRNG */ -#define FORTUNA -/* reseed every N calls to the read function */ -#define FORTUNA_WD 10 -/* number of pools (4..32) can save a bit of ram by lowering the count */ -#define FORTUNA_POOLS 32 - -/* Greg's SOBER128 PRNG ;-0 */ -#define SOBER128 - -/* the *nix style /dev/random device */ -#define DEVRANDOM -/* try /dev/urandom before trying /dev/random */ -#define TRY_URANDOM_FIRST - -#endif /* LTC_NO_PRNGS */ - -/* ---> math provider? <--- */ -#ifndef LTC_NO_MATH - -/* LibTomMath */ -/* #define LTM_DESC */ - -/* TomsFastMath */ -/* #define TFM_DESC */ - -#endif /* LTC_NO_MATH */ - -/* ---> Public Key Crypto <--- */ -#ifndef LTC_NO_PK - -/* Include RSA support */ -#define MRSA - -/* Include Katja (a Rabin variant like RSA) */ -/* #define MKAT */ - -/* Digital Signature Algorithm */ -#define MDSA - -/* ECC */ -#define MECC - -/* use Shamir's trick for point mul (speeds up signature verification) */ -#define LTC_ECC_SHAMIR - -#if defined(TFM_DESC) && defined(MECC) - #define MECC_ACCEL -#endif - -/* do we want fixed point ECC */ -/* #define MECC_FP */ - -/* Timing Resistant? */ -/* #define LTC_ECC_TIMING_RESISTANT */ - -#endif /* LTC_NO_PK */ - -/* PKCS #1 (RSA) and #5 (Password Handling) stuff */ -#ifndef LTC_NO_PKCS - -#define PKCS_1 -#define PKCS_5 - -/* Include ASN.1 DER (required by DSA/RSA) */ -#define LTC_DER - -#endif /* LTC_NO_PKCS */ - -/* cleanup */ - -#ifdef MECC -/* Supported ECC Key Sizes */ -#ifndef LTC_NO_CURVES - #define ECC112 - #define ECC128 - #define ECC160 - #define ECC192 - #define ECC224 - #define ECC256 - #define ECC384 - #define ECC521 -#endif -#endif - -#if defined(MECC) || defined(MRSA) || defined(MDSA) || defined(MKATJA) - /* Include the MPI functionality? (required by the PK algorithms) */ - #define MPI -#endif - -#ifdef MRSA - #define PKCS_1 -#endif - -#if defined(LTC_DER) && !defined(MPI) - #error ASN.1 DER requires MPI functionality -#endif - -#if (defined(MDSA) || defined(MRSA) || defined(MECC) || defined(MKATJA)) && !defined(LTC_DER) - #error PK requires ASN.1 DER functionality, make sure LTC_DER is enabled -#endif - -/* THREAD management */ -#ifdef LTC_PTHREAD - -#include <pthread.h> - -#define LTC_MUTEX_GLOBAL(x) pthread_mutex_t x = PTHREAD_MUTEX_INITIALIZER; -#define LTC_MUTEX_PROTO(x) extern pthread_mutex_t x; -#define LTC_MUTEX_TYPE(x) pthread_mutex_t x; -#define LTC_MUTEX_INIT(x) pthread_mutex_init(x, NULL); -#define LTC_MUTEX_LOCK(x) pthread_mutex_lock(x); -#define LTC_MUTEX_UNLOCK(x) pthread_mutex_unlock(x); - -#else - /* default no functions */ #define LTC_MUTEX_GLOBAL(x) #define LTC_MUTEX_PROTO(x) @@ -386,6 +135,7 @@ #define LTC_MUTEX_INIT(x) #define LTC_MUTEX_LOCK(x) #define LTC_MUTEX_UNLOCK(x) +#define FORTUNA_POOLS 0 #endif diff --git a/src/misc/crypt/crypt.c b/src/misc/crypt/crypt.c index ebc8c1e..8603943 100644 --- a/src/misc/crypt/crypt.c +++ b/src/misc/crypt/crypt.c @@ -15,6 +15,7 @@ Build strings, Tom St Denis */ +/* const char *crypt_build_settings = "LibTomCrypt " SCRYPT " (Tom St Denis, tomstdenis@gmail.com)\n" "LibTomCrypt is public domain software.\n" @@ -357,6 +358,7 @@ const char *crypt_build_settings = "\n" "\n\n\n" ; + */ /* $Source: /cvs/libtom/libtomcrypt/src/misc/crypt/crypt.c,v $ */ |