Just import the Dropbear 0.47 libtomcrypt changes
--HG-- branch : libtomcrypt-dropbear extra : convert_revision : 20dccfc09627970a312d77fb41dc2970b62689c3
... | ... | @@ -6,6 +6,9 @@ |
# The version | ||
VERSION=1.05 | ||
VPATH=@[email protected] | ||
srcdir=@[email protected] | ||
# Compiler and Linker Names | ||
#CC=gcc | ||
#LD=ld | ||
... | ... | @@ -15,25 +18,22 @@ VERSION=1.05 |
#ARFLAGS=r | ||
# Compilation flags. Note the += does not write over the user's CFLAGS! | ||
CFLAGS += -c -I./testprof/ -I./src/headers/ -Wall -Wsign-compare -W -Wshadow -Wno-unused-parameter | ||
# The rest of the flags come from the parent Dropbear makefile | ||
CFLAGS += -c -I$(srcdir)/src/headers/ -I$(srcdir)/../ | ||
# additional warnings (newer GCC 3.4 and higher) | ||
#CFLAGS += -Wsystem-headers -Wdeclaration-after-statement -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wmissing-prototypes \ | ||
# -Wmissing-declarations -Wpointer-arith | ||
ifndef IGNORE_SPEED | ||
# optimize for SPEED | ||
CFLAGS += -O3 -funroll-loops | ||
#CFLAGS += -O3 -funroll-loops | ||
# add -fomit-frame-pointer. hinders debugging! | ||
CFLAGS += -fomit-frame-pointer | ||
#CFLAGS += -fomit-frame-pointer | ||
# optimize for SIZE | ||
#CFLAGS += -Os -DLTC_SMALL_CODE | ||
endif | ||
# older GCCs can't handle the "rotate with immediate" ROLc/RORc/etc macros | ||
# define this to help | ||
#CFLAGS += -DLTC_NO_ROLC | ||
... | ... | @@ -77,9 +77,9 @@ endif |
#List of objects to compile. | ||
#Leave MPI built-in or force developer to link against libtommath? | ||
ifndef IGNORE_MPI | ||
MPIOBJECT=src/misc/mpi/mpi.o | ||
endif | ||
#MPIOBJECT=src/misc/mpi/mpi.o | ||
#Dropbear uses libtommath | ||
MPIOBJECT= | ||
OBJECTS=src/ciphers/aes/aes_enc.o $(MPIOBJECT) src/ciphers/aes/aes.o src/ciphers/anubis.o \ | ||
src/ciphers/blowfish.o src/ciphers/cast5.o src/ciphers/des.o src/ciphers/khazad.o src/ciphers/noekeon.o \ | ||
... | ... | @@ -130,37 +130,7 @@ src/modes/ctr/ctr_getiv.o src/modes/ctr/ctr_setiv.o src/modes/ctr/ctr_start.o \ |
src/modes/ecb/ecb_decrypt.o src/modes/ecb/ecb_done.o src/modes/ecb/ecb_encrypt.o \ | ||
src/modes/ecb/ecb_start.o src/modes/ofb/ofb_decrypt.o src/modes/ofb/ofb_done.o \ | ||
src/modes/ofb/ofb_encrypt.o src/modes/ofb/ofb_getiv.o src/modes/ofb/ofb_setiv.o \ | ||
src/modes/ofb/ofb_start.o src/pk/asn1/der/bit/der_decode_bit_string.o \ | ||
src/pk/asn1/der/bit/der_encode_bit_string.o src/pk/asn1/der/bit/der_length_bit_string.o \ | ||
src/pk/asn1/der/choice/der_decode_choice.o src/pk/asn1/der/ia5/der_decode_ia5_string.o \ | ||
src/pk/asn1/der/ia5/der_encode_ia5_string.o src/pk/asn1/der/ia5/der_length_ia5_string.o \ | ||
src/pk/asn1/der/integer/der_decode_integer.o src/pk/asn1/der/integer/der_encode_integer.o \ | ||
src/pk/asn1/der/integer/der_length_integer.o \ | ||
src/pk/asn1/der/object_identifier/der_decode_object_identifier.o \ | ||
src/pk/asn1/der/object_identifier/der_encode_object_identifier.o \ | ||
src/pk/asn1/der/object_identifier/der_length_object_identifier.o \ | ||
src/pk/asn1/der/octet/der_decode_octet_string.o src/pk/asn1/der/octet/der_encode_octet_string.o \ | ||
src/pk/asn1/der/octet/der_length_octet_string.o \ | ||
src/pk/asn1/der/printable_string/der_decode_printable_string.o \ | ||
src/pk/asn1/der/printable_string/der_encode_printable_string.o \ | ||
src/pk/asn1/der/printable_string/der_length_printable_string.o \ | ||
src/pk/asn1/der/sequence/der_decode_sequence.o src/pk/asn1/der/sequence/der_decode_sequence_multi.o \ | ||
src/pk/asn1/der/sequence/der_encode_sequence.o src/pk/asn1/der/sequence/der_encode_sequence_multi.o \ | ||
src/pk/asn1/der/sequence/der_length_sequence.o \ | ||
src/pk/asn1/der/short_integer/der_decode_short_integer.o \ | ||
src/pk/asn1/der/short_integer/der_encode_short_integer.o \ | ||
src/pk/asn1/der/short_integer/der_length_short_integer.o src/pk/asn1/der/utctime/der_decode_utctime.o \ | ||
src/pk/asn1/der/utctime/der_encode_utctime.o src/pk/asn1/der/utctime/der_length_utctime.o \ | ||
src/pk/dh/dh.o src/pk/dsa/dsa_export.o src/pk/dsa/dsa_free.o src/pk/dsa/dsa_import.o \ | ||
src/pk/dsa/dsa_make_key.o src/pk/dsa/dsa_sign_hash.o src/pk/dsa/dsa_verify_hash.o \ | ||
src/pk/dsa/dsa_verify_key.o src/pk/ecc/ecc.o src/pk/packet_store_header.o src/pk/packet_valid_header.o \ | ||
src/pk/pkcs1/pkcs_1_i2osp.o src/pk/pkcs1/pkcs_1_mgf1.o src/pk/pkcs1/pkcs_1_oaep_decode.o \ | ||
src/pk/pkcs1/pkcs_1_oaep_encode.o src/pk/pkcs1/pkcs_1_os2ip.o src/pk/pkcs1/pkcs_1_pss_decode.o \ | ||
src/pk/pkcs1/pkcs_1_pss_encode.o src/pk/rsa/rsa_decrypt_key.o src/pk/rsa/rsa_encrypt_key.o \ | ||
src/pk/rsa/rsa_export.o src/pk/rsa/rsa_exptmod.o src/pk/rsa/rsa_free.o src/pk/rsa/rsa_import.o \ | ||
src/pk/rsa/rsa_make_key.o src/pk/rsa/rsa_sign_hash.o src/pk/rsa/rsa_verify_hash.o src/prngs/fortuna.o \ | ||
src/prngs/rc4.o src/prngs/rng_get_bytes.o src/prngs/rng_make_prng.o src/prngs/sober128.o \ | ||
src/prngs/sprng.o src/prngs/yarrow.o | ||
src/modes/ofb/ofb_start.o | ||
HEADERS=src/headers/tommath_superclass.h src/headers/tomcrypt_cfg.h src/headers/tomcrypt_mac.h \ | ||
src/headers/tomcrypt_macros.h src/headers/tomcrypt_custom.h src/headers/tomcrypt_argchk.h \ | ||
... | ... | @@ -207,7 +177,7 @@ $(LIBTEST): |
$(LIBNAME): $(OBJECTS) | ||
$(AR) $(ARFLAGS) [email protected] $(OBJECTS) | ||
ranlib $(LIBNAME) | ||
$(RANLIB) $(LIBNAME) | ||
#This rule makes the hash program included with libtomcrypt | ||
hashsum: library $(HASHOBJECTS) | ||
... | ... | @@ -260,24 +230,8 @@ profile: |
#This rule cleans the source tree of all compiled code, not including the pdf | ||
#documentation. | ||
clean: | ||
rm -f `find . -type f | grep "[.]o" | xargs` | ||
rm -f `find . -type f | grep "[.]lo" | xargs` | ||
rm -f `find . -type f | grep "[.]a" | xargs` | ||
rm -f `find . -type f | grep "[.]la" | xargs` | ||
rm -f `find . -type f | grep "[.]obj" | xargs` | ||
rm -f `find . -type f | grep "[.]lib" | xargs` | ||
rm -f `find . -type f | grep "[.]exe" | xargs` | ||
rm -f `find . -type f | grep "[.]gcda" | xargs` | ||
rm -f `find . -type f | grep "[.]gcno" | xargs` | ||
rm -f `find . -type f | grep "[.]il" | xargs` | ||
rm -f `find . -type f | grep "[.]dyn" | xargs` | ||
rm -f `find . -type f | grep "[.]dpi" | xargs` | ||
rm -rf `find . -type d | grep "[.]libs" | xargs` | ||
rm -f crypt.aux crypt.dvi crypt.idx crypt.ilg crypt.ind crypt.log crypt.toc | ||
rm -f $(TV) $(PROF) $(SMALL) $(CRYPT) $(HASHSUM) $(MULTI) $(TIMING) $(TEST) | ||
rm -rf doc/doxygen | ||
rm -f doc/*.pdf | ||
rm -f *.txt | ||
-rm -f $(OBJECTS) | ||
-rm -f libtomcrypt.a | ||
#build the doxy files (requires Doxygen, tetex and patience) | ||
doxy: | ||
... | ... |
doc/crypt.pdf
deleted
100644 → 0
File deleted
... | ... | @@ -15,6 +15,7 @@ |
Build strings, Tom St Denis | ||
*/ | ||
/* | ||
const char *crypt_build_settings = | ||
"LibTomCrypt " SCRYPT " (Tom St Denis, [email protected])\n" | ||
"LibTomCrypt is public domain software.\n" | ||
... | ... | @@ -308,6 +309,7 @@ const char *crypt_build_settings = |
"\n" | ||
"\n\n\n" | ||
; | ||
*/ | ||
/* $Source: /cvs/libtom/libtomcrypt/src/misc/crypt/crypt.c,v $ */ | ||
... | ... |
src/misc/mpi/mpi.c
deleted
100644 → 0
This diff is collapsed.
Please register or sign in to comment