Add SHA256/SHA512 support to crypt.c and fix up the MD5 component (it seemed to have been broken). In addition, unconditionally use the libratbox crypt.

This commit is contained in:
JD Horelick 2011-01-19 15:50:46 -05:00
parent bd477ff3a3
commit 12e395252c
5 changed files with 1836 additions and 1095 deletions

868
libratbox/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -200,25 +200,6 @@ AC_CHECK_TYPES([struct sockaddr_storage],[
]) ])
save_LIBS=$LIBS
AC_SEARCH_LIBS(crypt, [crypt descrypt],,)
LIBS=$save_LIBS
CRYPT_LIB=$ac_cv_search_crypt
if test "$CRYPT_LIB" = "none required"; then
unset CRYPT_LIB
elif test "$CRYPT_LIB" = no; then
need_crypt=yes;
AC_DEFINE(NEED_CRYPT, 1, [Define if your system needs crypt.])
unset CRYPT_LIB
fi
AM_CONDITIONAL([NEED_CRYPT], [test x"$need_crypt" = "xyes"])
AC_SUBST(CRYPT_LIB)
dnl Check for stdarg.h - if we cant find it, halt configure dnl Check for stdarg.h - if we cant find it, halt configure
AC_CHECK_HEADER(stdarg.h, , [AC_MSG_ERROR([** stdarg.h could not be found - libratbox will not compile without it **])]) AC_CHECK_HEADER(stdarg.h, , [AC_MSG_ERROR([** stdarg.h could not be found - libratbox will not compile without it **])])

View File

@ -42,7 +42,7 @@ libratbox_la_SOURCES = \
version.c version.c
libratbox_la_LDFLAGS = @CRYPT_LIB@ @SSL_LIBS@ @GNUTLS_LIBS@ -avoid-version -no-undefined -export-symbols export-syms.txt libratbox_la_LDFLAGS = @SSL_LIBS@ @GNUTLS_LIBS@ -avoid-version -no-undefined -export-symbols export-syms.txt
libratbox_la_LIBADD = @CRYPT_LIB@ @SSL_LIBS@ @GNUTLS_LIBS@ libratbox_la_LIBADD = @SSL_LIBS@ @GNUTLS_LIBS@
lib_LTLIBRARIES = libratbox.la lib_LTLIBRARIES = libratbox.la

View File

@ -257,8 +257,8 @@ libratbox_la_SOURCES = \
arc4random.c \ arc4random.c \
version.c version.c
libratbox_la_LDFLAGS = @CRYPT_LIB@ @SSL_LIBS@ @GNUTLS_LIBS@ -avoid-version -no-undefined -export-symbols export-syms.txt libratbox_la_LDFLAGS = @SSL_LIBS@ @GNUTLS_LIBS@ -avoid-version -no-undefined -export-symbols export-syms.txt
libratbox_la_LIBADD = @CRYPT_LIB@ @SSL_LIBS@ @GNUTLS_LIBS@ libratbox_la_LIBADD = @SSL_LIBS@ @GNUTLS_LIBS@
lib_LTLIBRARIES = libratbox.la lib_LTLIBRARIES = libratbox.la
all: $(BUILT_SOURCES) all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am $(MAKE) $(AM_MAKEFLAGS) all-am

File diff suppressed because it is too large Load Diff