48b8c076a7
On Sun, Nov 01, 2009 at 02:54:13PM -0800, Keith Packard wrote: > Excerpts from Matthieu Herrb's message of Sun Nov 01 09:34:35 -0800 2009: > > > +AC_CHECK_FUNCS([SHA1Init], [HAVE_LIBC_SHA1=yes]) > > I'd suggest AC_CHECK_FUNC instead; as far as I can tell, AC_CHECK_FUNCS > will also define HAVE_SHA1INIT. Also, can you use HAVE_LIBC_SHA1 > consistently rather than having two separate names (HAVE_LIBC_SHA1 and > HAVE_SHA1_IN_LIBC)? Yes, I know one is a preprocessor symbol and the > other is a cpp shell variable, but I think that will work anyway. > New version taking you comments into account. From: Matthieu Herrb <matthieu.herrb@laas.fr> Date: Sun, 1 Nov 2009 18:19:27 +0100 Subject: [PATCH] Add a probe for SHA1 functions in libc in *BSD. The interface is the same as the one in libmd. Signed-off-by: Keith Packard <keithp@keithp.com>
141 lines
2.6 KiB
C
141 lines
2.6 KiB
C
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#include "os.h"
|
|
#include "xsha1.h"
|
|
|
|
#if defined(HAVE_SHA1_IN_LIBMD) /* Use libmd for SHA1 */ \
|
|
|| defined(HAVE_SHA1_IN_LIBC) /* Use libc for SHA1 */
|
|
|
|
# include <sha1.h>
|
|
|
|
void *x_sha1_init(void)
|
|
{
|
|
SHA1_CTX *ctx = xalloc(sizeof(*ctx));
|
|
if (!ctx)
|
|
return NULL;
|
|
SHA1Init(ctx);
|
|
return ctx;
|
|
}
|
|
|
|
int x_sha1_update(void *ctx, void *data, int size)
|
|
{
|
|
SHA1_CTX *sha1_ctx = ctx;
|
|
SHA1Update(sha1_ctx, data, size);
|
|
return 1;
|
|
}
|
|
|
|
int x_sha1_final(void *ctx, unsigned char result[20])
|
|
{
|
|
SHA1_CTX *sha1_ctx = ctx;
|
|
SHA1Final(result, sha1_ctx);
|
|
xfree(sha1_ctx);
|
|
return 1;
|
|
}
|
|
|
|
#elif defined(HAVE_SHA1_IN_LIBGCRYPT) /* Use libgcrypt for SHA1 */
|
|
|
|
# include <gcrypt.h>
|
|
|
|
void *x_sha1_init(void)
|
|
{
|
|
static int init;
|
|
gcry_md_hd_t h;
|
|
gcry_error_t err;
|
|
|
|
if (!init) {
|
|
if (!gcry_check_version(NULL))
|
|
return NULL;
|
|
gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
|
|
gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
|
|
init = 1;
|
|
}
|
|
|
|
err = gcry_md_open(&h, GCRY_MD_SHA1, 0);
|
|
if (err)
|
|
return NULL;
|
|
return h;
|
|
}
|
|
|
|
int x_sha1_update(void *ctx, void *data, int size)
|
|
{
|
|
gcry_md_hd_t h = ctx;
|
|
gcry_md_write(h, data, size);
|
|
return 1;
|
|
}
|
|
|
|
int x_sha1_final(void *ctx, unsigned char result[20])
|
|
{
|
|
gcry_md_hd_t h = ctx;
|
|
memcpy(result, gcry_md_read(h, GCRY_MD_SHA1), 20);
|
|
gcry_md_close(h);
|
|
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 */
|
|
# include <openssl/sha.h>
|
|
|
|
void *x_sha1_init(void)
|
|
{
|
|
int ret;
|
|
SHA_CTX *ctx = xalloc(sizeof(*ctx));
|
|
if (!ctx)
|
|
return NULL;
|
|
ret = SHA1_Init(ctx);
|
|
if (!ret) {
|
|
xfree(ctx);
|
|
return NULL;
|
|
}
|
|
return ctx;
|
|
}
|
|
|
|
int x_sha1_update(void *ctx, void *data, int size)
|
|
{
|
|
int ret;
|
|
SHA_CTX *sha_ctx = ctx;
|
|
ret = SHA1_Update(sha_ctx, data, size);
|
|
if (!ret)
|
|
xfree(sha_ctx);
|
|
return ret;
|
|
}
|
|
|
|
int x_sha1_final(void *ctx, unsigned char result[20])
|
|
{
|
|
int ret;
|
|
SHA_CTX *sha_ctx = ctx;
|
|
ret = SHA1_Final(result, sha_ctx);
|
|
xfree(sha_ctx);
|
|
return ret;
|
|
}
|
|
|
|
#endif
|