diff options
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | include/dix-config.h.in | 3 | ||||
| -rw-r--r-- | os/xsha1.c | 26 |
3 files changed, 39 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e7c050446..02e9146bb 100644 --- a/configure.ac +++ b/configure.ac @@ -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], diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 7f1fb1836..ebf373392 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -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 diff --git a/os/xsha1.c b/os/xsha1.c index 723521e05..94092caa7 100644 --- a/os/xsha1.c +++ b/os/xsha1.c @@ -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 */ |