File beecrypt.diff of Package rpm-ndb.25695

Overview Repositories Revisions Requests Users Attributes Meta

File beecrypt.diff of Package rpm-ndb.25695

--- beecrypt-4.1.2/Makefile.am.orig	2004-12-22 07:06:31.000000000 +0000
+++ beecrypt-4.1.2/Makefile.am	2019-12-11 16:07:44.098540989 +0000
@@ -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)
--- beecrypt-4.1.2/acinclude.m4.orig	2004-12-19 20:16:35.000000000 +0000
+++ beecrypt-4.1.2/acinclude.m4	2019-12-11 16:08:05.370490481 +0000
@@ -459,7 +459,7 @@ AC_DEFUN([BEECRYPT_GNU_CC],[
     CFLAGS="$CFLAGS -Wall -pedantic"
   else
     # Generic optimizations, including cpu tuning
-    BEECRYPT_CFLAGS_REM([-g])
+    #BEECRYPT_CFLAGS_REM([-g])
     CFLAGS="$CFLAGS -DNDEBUG -fomit-frame-pointer"
     if test "$bc_cv_c_aggressive_opt" = yes; then
       case $bc_target_cpu in
@@ -571,7 +571,7 @@ AC_DEFUN([BEECRYPT_GNU_CXX],[
     CXXFLAGS="$CXXFLAGS -Wall -pedantic"
   else
     # Generic optimizations, including cpu tuning
-    BEECRYPT_CXXFLAGS_REM([-g])
+    #BEECRYPT_CXXFLAGS_REM([-g])
 	CXXFLAGS="$CXXFLAGS -DNDEBUG"
     if test "$bc_cv_c_aggressive_opt" = yes; then
       case $bc_target_cpu in
--- beecrypt-4.1.2/base64.c.orig	2004-12-19 20:21:04.000000000 +0000
+++ beecrypt-4.1.2/base64.c	2019-12-11 16:07:44.098540989 +0000
@@ -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;
--- beecrypt-4.1.2/c++/io/DataOutputStream.cxx.orig	2004-11-04 12:38:15.000000000 +0000
+++ beecrypt-4.1.2/c++/io/DataOutputStream.cxx	2019-12-11 16:07:44.098540989 +0000
@@ -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();
 }
--- beecrypt-4.1.2/configure.ac.orig	2004-12-21 11:37:56.000000000 +0000
+++ beecrypt-4.1.2/configure.ac	2019-12-11 16:08:05.366490491 +0000
@@ -1,8 +1,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_INIT([beecrypt],[4.1.2],[bob.deblier@telenet.be])
-AM_INIT_AUTOMAKE
 AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(beecrypt.h)
 AC_CONFIG_HEADERS([config.h])

Places

File beecrypt.diff of Package rpm-ndb.25695

Places