diff options
author | Simo Sorce <simo@redhat.com> | 2013-10-19 14:59:03 -0400 |
---|---|---|
committer | Simo Sorce <simo@redhat.com> | 2013-10-23 08:53:08 -0400 |
commit | 3d372dfa045cf6bed5d548d86bce57db8241b9ec (patch) | |
tree | 084e7d421347233130652bb4eaaeb82e6a01a8bf | |
parent | 18f1004c1083cc3988f869e84102568731fbb901 (diff) | |
download | gss-ntlmssp-3d372dfa045cf6bed5d548d86bce57db8241b9ec.tar.gz gss-ntlmssp-3d372dfa045cf6bed5d548d86bce57db8241b9ec.tar.xz gss-ntlmssp-3d372dfa045cf6bed5d548d86bce57db8241b9ec.zip |
Add CRC32 function using Zlib's crc32
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | external/ax_check_zlib.m4 | 142 | ||||
-rw-r--r-- | src/crypto.c | 6 | ||||
-rw-r--r-- | src/crypto.h | 10 |
4 files changed, 161 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 352d535..39d1bec 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,7 @@ m4_include([external/docbook.m4]) m4_include([external/sizes.m4]) m4_include([external/ax_pthread.m4]) m4_include([external/m4_ax_check_openssl.m4]) +m4_include([external/ax_check_zlib.m4]) AX_PTHREAD(,[AC_MSG_ERROR([Could not find Pthreads support])]) @@ -99,6 +100,8 @@ AX_CHECK_OPENSSL(,[AC_MSG_ERROR([Could not find OpenSSL support])]) CRYPTO_LIBS="$OPENSSL_LIBS" AC_SUBST([CRYPTO_LIBS]) +AX_CHECK_ZLIB(,[AC_MSG_ERROR([Could not find Zlib support])]) + if test x$HAVE_MANPAGES != x; then CHECK_XML_TOOLS CHECK_STYLESHEET([$SGML_CATALOG_FILES], diff --git a/external/ax_check_zlib.m4 b/external/ax_check_zlib.m4 new file mode 100644 index 0000000..ae5705f --- /dev/null +++ b/external/ax_check_zlib.m4 @@ -0,0 +1,142 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_zlib.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_ZLIB([action-if-found], [action-if-not-found]) +# +# DESCRIPTION +# +# This macro searches for an installed zlib library. If nothing was +# specified when calling configure, it searches first in /usr/local and +# then in /usr, /opt/local and /sw. If the --with-zlib=DIR is specified, +# it will try to find it in DIR/include/zlib.h and DIR/lib/libz.a. If +# --without-zlib is specified, the library is not searched at all. +# +# If either the header file (zlib.h) or the library (libz) is not found, +# shell commands 'action-if-not-found' is run. If 'action-if-not-found' is +# not specified, the configuration exits on error, asking for a valid zlib +# installation directory or --without-zlib. +# +# If both header file and library are found, shell commands +# 'action-if-found' is run. If 'action-if-found' is not specified, the +# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, appends +# '-L$ZLIB_HOME}/lib' to LDFLAGS, prepends '-lz' to LIBS, and calls +# AC_DEFINE(HAVE_LIBZ). You should use autoheader to include a definition +# for this symbol in a config.h file. Sample usage in a C/C++ source is as +# follows: +# +# #ifdef HAVE_LIBZ +# #include <zlib.h> +# #endif /* HAVE_LIBZ */ +# +# LICENSE +# +# Copyright (c) 2008 Loic Dachary <loic@senga.org> +# Copyright (c) 2010 Bastien Chevreux <bach@chevreux.org> +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 14 + +AU_ALIAS([CHECK_ZLIB], [AX_CHECK_ZLIB]) +AC_DEFUN([AX_CHECK_ZLIB], +# +# Handle user hints +# +[AC_MSG_CHECKING(if zlib is wanted) +zlib_places="/usr/local /usr /opt/local /sw" +AC_ARG_WITH([zlib], +[ --with-zlib=DIR root directory path of zlib installation @<:@defaults to + /usr/local or /usr if not found in /usr/local@:>@ + --without-zlib to disable zlib usage completely], +[if test "$withval" != no ; then + AC_MSG_RESULT(yes) + if test -d "$withval" + then + zlib_places="$withval $zlib_places" + else + AC_MSG_WARN([Sorry, $withval does not exist, checking usual places]) + fi +else + zlib_places= + AC_MSG_RESULT(no) +fi], +[AC_MSG_RESULT(yes)]) + +# +# Locate zlib, if wanted +# +if test -n "${zlib_places}" +then + # check the user supplied or any other more or less 'standard' place: + # Most UNIX systems : /usr/local and /usr + # MacPorts / Fink on OSX : /opt/local respectively /sw + for ZLIB_HOME in ${zlib_places} ; do + if test -f "${ZLIB_HOME}/include/zlib.h"; then break; fi + ZLIB_HOME="" + done + + ZLIB_OLD_LDFLAGS=$LDFLAGS + ZLIB_OLD_CPPFLAGS=$CPPFLAGS + if test -n "${ZLIB_HOME}"; then + LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" + CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" + fi + AC_LANG_SAVE + AC_LANG_C + AC_CHECK_LIB([z], [inflateEnd], [zlib_cv_libz=yes], [zlib_cv_libz=no]) + AC_CHECK_HEADER([zlib.h], [zlib_cv_zlib_h=yes], [zlib_cv_zlib_h=no]) + AC_LANG_RESTORE + if test "$zlib_cv_libz" = "yes" && test "$zlib_cv_zlib_h" = "yes" + then + # + # If both library and header were found, action-if-found + # + m4_ifblank([$1],[ + CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" + LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" + LIBS="-lz $LIBS" + AC_DEFINE([HAVE_LIBZ], [1], + [Define to 1 if you have `z' library (-lz)]) + ],[ + # Restore variables + LDFLAGS="$ZLIB_OLD_LDFLAGS" + CPPFLAGS="$ZLIB_OLD_CPPFLAGS" + $1 + ]) + else + # + # If either header or library was not found, action-if-not-found + # + m4_default([$2],[ + AC_MSG_ERROR([either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib]) + ]) + fi +fi +]) diff --git a/src/crypto.c b/src/crypto.c index aabd399..8074d4b 100644 --- a/src/crypto.c +++ b/src/crypto.c @@ -22,6 +22,7 @@ #include <openssl/evp.h> #include <openssl/hmac.h> #include <openssl/rand.h> +#include <zlib.h> #include "crypto.h" @@ -299,3 +300,8 @@ int DESL(struct ntlm_buffer *key, return 0; } + +uint32_t CRC32(uint32_t crc, struct ntlm_buffer *payload) +{ + return crc32(crc, payload->data, payload->length); +} diff --git a/src/crypto.h b/src/crypto.h index 9f2448a..87ff830 100644 --- a/src/crypto.h +++ b/src/crypto.h @@ -153,4 +153,14 @@ int DESL(struct ntlm_buffer *key, struct ntlm_buffer *payload, struct ntlm_buffer *result); +/** + * @brief The CRC32 checksum + * + * @param crc Initial crc, usually 0 + * @param payload The data to checksum + * + * @return The resulting CRC. + */ +uint32_t CRC32(uint32_t crc, struct ntlm_buffer *payload); + #endif /* _SRC_CRYPTO_H_ */ |