Index: beecrypt-4.1.2/Makefile.am =================================================================== --- beecrypt-4.1.2/Makefile.am.orig +++ beecrypt-4.1.2/Makefile.am @@ -49,7 +49,7 @@ libaltdir=$(prefix)/lib@LIBALT@ libalt_LTLIBRARIES = libbeecrypt.la -libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c rsa.c rsakp.c rsapk.c sha1.c sha256.c sha384.c sha512.c sha_k.c timestamp.c cppglue.cxx +libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c rsa.c rsakp.c rsapk.c sha1.c sha256.c sha384.c sha512.c sha_k.c timestamp.c libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS) libbeecrypt_la_LIBADD = aesopt.lo blowfishopt.lo mpopt.lo sha1opt.lo libbeecrypt_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE) @@ -62,5 +62,11 @@ EXTRA_DIST = BENCHMARKS BUGS CONTRIBUTOR DISTCLEANFILES = mpopt.s aesopt.s blowfishopt.s sha1opt.s +BUILT_SOURCES = listobjs + +.PHONY: listobjs +listobjs: + @echo $(libbeecrypt_la_OBJECTS) $(libbeecrypt_la_LIBADD) > $@ + bench: (cd tests && $(MAKE) $(AM_MAKEFLAGS) bench) Index: beecrypt-4.1.2/base64.c =================================================================== --- beecrypt-4.1.2/base64.c.orig +++ beecrypt-4.1.2/base64.c @@ -253,7 +253,6 @@ char* b64encode(const void* data, size_t unsigned c; if (s == NULL) return NULL; - if (*s == '\0') return calloc(1, sizeof(*t)); if (ns == 0) ns = strlen((const char*) s); nt = ((ns + 2) / 3) * 4; Index: beecrypt-4.1.2/c++/io/DataOutputStream.cxx =================================================================== --- beecrypt-4.1.2/c++/io/DataOutputStream.cxx.orig +++ beecrypt-4.1.2/c++/io/DataOutputStream.cxx @@ -126,8 +126,8 @@ void DataOutputStream::writeLong(javalon void DataOutputStream::writeChar(javaint v) throw (IOException) { _lock.lock(); - out.write((v >> 8) && 0xff); - out.write((v ) && 0xff); + out.write((v >> 8) & 0xff); + out.write((v ) & 0xff); written += 2; _lock.unlock(); }