From 40af52a10e0688e7d229c55623b61409db18d0b8 Mon Sep 17 00:00:00 2001 From: joonicks Date: Sat, 15 Nov 2025 14:50:29 +0100 Subject: [PATCH] sha512 internal code --- configure | 11 +++++++---- src/Makefile.in | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 8c46079..a294734 100755 --- a/configure +++ b/configure @@ -882,9 +882,9 @@ if [ ! "$ft_sha" = no ]; then if [ "$ft_sha" = internal512 ]; then sha_internal=config/sha512.c sha_object=config/sha512.o - crypt_func='-DCRYPT_FUNC=__crypt_sha512' - CRYPT_FUNCTION='#define CRYPT_FUNC __crypt_sha512' - $CC -c $sha_internal -o $sha_object + crypt_func='-DCRYPT_FUNC=crypt_sha512' + CRYPT_FUNCTION='#define CRYPT_FUNC crypt_sha512' + $CC -o $TESTP $sha_internal -DTEST 1> /dev/null 2> /dev/null fi if [ "$ft_sha" = internal ]; then sha_internal=config/sha1.c @@ -893,7 +893,9 @@ if [ ! "$ft_sha" = no ]; then CRYPT_FUNCTION='#define CRYPT_FUNC sha_crypt' fi # - $CC -o $TESTP $TESTC $sha_object $crypt_func 1> /dev/null 2> /dev/null + if [ ! -x $TESTP ]; then + $CC -o $TESTP $TESTC $sha_object $crypt_func 1> /dev/null 2> /dev/null + fi # if [ ! -x $TESTP ]; then crypt_func='-DCRYPT_FUNC=crypt' @@ -916,6 +918,7 @@ if [ ! "$ft_sha" = no ]; then if [ -x $TESTP ]; then pwhash=`$TESTP` case "$pwhash" in + SHA512 ) has_sha=internal512 ;; MD5 ) has_md5=yes ;; SHA ) has_sha=yes ;; SHAMD5 ) diff --git a/src/Makefile.in b/src/Makefile.in index 464ce34..ed3e0dc 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -108,8 +108,8 @@ mega-install mi:mega $(SRCFILES) $(INCS) usage.h $(CHMOD) $(INSTALLMODE) $(INSTALLNAME) $(MV) $(INSTALLNAME) $(INSTALLDIR) -mega: $(SRCFILES) $(INCS) usage.h - $(CROSS_COMPILE)$(CC) $(CFLAGS) -o $(INSTALLNAME) main.c -DMEGA_C -DGENDATE="`./gencmd date`" -I. $(LPROF) $(LIBS) $(LDSCRIPT) $(PYINCLUDE) $(TCLINCLUDE) $(I_PERL) $(L_PERL) +mega: $(SRCFILES) $(INCS) usage.h @SHA_O@ + $(CROSS_COMPILE)$(CC) $(CFLAGS) -o $(INSTALLNAME) main.c -DMEGA_C -DGENDATE="`./gencmd date`" -I. @SHA_O@ $(LPROF) $(LIBS) $(LDSCRIPT) $(PYINCLUDE) $(TCLINCLUDE) $(I_PERL) $(L_PERL) #@oc@ $(CROSS_COMPILE)objcopy -R .note -R .comment $(INSTALLNAME) @sz@ size $(INSTALLNAME)