sha512 internal code

This commit is contained in:
joonicks
2025-11-15 14:50:29 +01:00
parent 684d4771dc
commit 40af52a10e
2 changed files with 9 additions and 6 deletions

11
configure vendored
View File

@@ -882,9 +882,9 @@ if [ ! "$ft_sha" = no ]; then
if [ "$ft_sha" = internal512 ]; then if [ "$ft_sha" = internal512 ]; then
sha_internal=config/sha512.c sha_internal=config/sha512.c
sha_object=config/sha512.o sha_object=config/sha512.o
crypt_func='-DCRYPT_FUNC=__crypt_sha512' crypt_func='-DCRYPT_FUNC=crypt_sha512'
CRYPT_FUNCTION='#define CRYPT_FUNC __crypt_sha512' CRYPT_FUNCTION='#define CRYPT_FUNC crypt_sha512'
$CC -c $sha_internal -o $sha_object $CC -o $TESTP $sha_internal -DTEST 1> /dev/null 2> /dev/null
fi fi
if [ "$ft_sha" = internal ]; then if [ "$ft_sha" = internal ]; then
sha_internal=config/sha1.c sha_internal=config/sha1.c
@@ -893,7 +893,9 @@ if [ ! "$ft_sha" = no ]; then
CRYPT_FUNCTION='#define CRYPT_FUNC sha_crypt' CRYPT_FUNCTION='#define CRYPT_FUNC sha_crypt'
fi 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 if [ ! -x $TESTP ]; then
crypt_func='-DCRYPT_FUNC=crypt' crypt_func='-DCRYPT_FUNC=crypt'
@@ -916,6 +918,7 @@ if [ ! "$ft_sha" = no ]; then
if [ -x $TESTP ]; then if [ -x $TESTP ]; then
pwhash=`$TESTP` pwhash=`$TESTP`
case "$pwhash" in case "$pwhash" in
SHA512 ) has_sha=internal512 ;;
MD5 ) has_md5=yes ;; MD5 ) has_md5=yes ;;
SHA ) has_sha=yes ;; SHA ) has_sha=yes ;;
SHAMD5 ) SHAMD5 )

View File

@@ -108,8 +108,8 @@ mega-install mi:mega $(SRCFILES) $(INCS) usage.h
$(CHMOD) $(INSTALLMODE) $(INSTALLNAME) $(CHMOD) $(INSTALLMODE) $(INSTALLNAME)
$(MV) $(INSTALLNAME) $(INSTALLDIR) $(MV) $(INSTALLNAME) $(INSTALLDIR)
mega: $(SRCFILES) $(INCS) usage.h mega: $(SRCFILES) $(INCS) usage.h @SHA_O@
$(CROSS_COMPILE)$(CC) $(CFLAGS) -o $(INSTALLNAME) main.c -DMEGA_C -DGENDATE="`./gencmd date`" -I. $(LPROF) $(LIBS) $(LDSCRIPT) $(PYINCLUDE) $(TCLINCLUDE) $(I_PERL) $(L_PERL) $(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) #@oc@ $(CROSS_COMPILE)objcopy -R .note -R .comment $(INSTALLNAME)
@sz@ size $(INSTALLNAME) @sz@ size $(INSTALLNAME)