andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

os: Add libsha1 as a choice of SHA1 implementation

Browse Source 
There are small systems which don't need OpenSSL or gcrypt.
Add libsha1 (http://github.com/dottedmag/libsha1) as an alternative
small SHA1 implementation.

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Mikhail Gusarov 2009-10-29 01:54:00 +06:00 committed by Keith Packard
parent 8613e4b0eb
commit ccf4a69db7
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -1286,7 +1286,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
# SHA1 hashing
AC_ARG_WITH([sha1],
[AS_HELP_STRING([--with-sha1=libmd|libgcrypt|libcrypto],
[AS_HELP_STRING([--with-sha1=libmd|libgcrypt|libcrypto|libsha1],
[choose SHA1 implementation])])
AC_CHECK_LIB([md], [SHA1Init], [HAVE_LIBMD=yes])
if test "x$with_sha1" = x && test "x$HAVE_LIBMD" = xyes; then
@ -1309,6 +1309,15 @@ if test "x$with_sha1" = xlibgcrypt; then
[Use libgcrypt SHA1 functions])
SHA1_LIBS=-lgcrypt
fi
AC_CHECK_LIB([sha1], [sha1_begin], [HAVE_LIBSHA1=yes])
if test "x$with_sha1" = x && test "x$HAVE_LIBSHA1" = xyes; then
with_sha1=libsha1
fi
if test "x$with_sha1" = xlibsha1; then
AC_DEFINE([HAVE_SHA1_IN_LIBSHA1], [1],
[Use libsha1 for SHA1])
SHA1_LIBS=-lsha1
fi
# We don't need all of the OpenSSL libraries, just libcrypto
AC_CHECK_LIB([crypto], [SHA1_Init], [HAVE_LIBCRYPTO=yes])
PKG_CHECK_MODULES([OPENSSL], [openssl], [HAVE_OPENSSL_PKC=yes],

3
include/dix-config.h.in
View File

@ -166,6 +166,9 @@
/* Define to use libgcrypt SHA1 functions */
#undef HAVE_SHA1_IN_LIBGCRYPT
/* Define to use libsha1 for SHA1 */
#undef HAVE_SHA1_IN_LIBSHA1
/* Define to 1 if you have the `shmctl64' function. */
#undef HAVE_SHMCTL64

26
os/xsha1.c
View File

@ -72,6 +72,32 @@ int x_sha1_final(void *ctx, unsigned char result[20])
return 1;
}
#elif defined(HAVE_SHA1_IN_LIBSHA1) /* Use libsha1 */
# include <libsha1.h>
void *x_sha1_init(void)
{
sha1_ctx *ctx = xalloc(sizeof(*ctx));
if(!ctx)
return NULL;
sha1_begin(ctx);
return ctx;
}
int x_sha1_update(void *ctx, void *data, int size)
{
sha1_hash(data, size, ctx);
return 1;
}
int x_sha1_final(void *ctx, unsigned char result[20])
{
sha1_end(result, ctx);
xfree(ctx);
return 1;
}
#else /* Use OpenSSL's libcrypto */
# include <stddef.h> /* buggy openssl/sha.h wants size_t */