~drizzle-trunk/drizzle/development

Committer: Monty Taylor
Date: 2010-03-23 10:28:09 UTC
mto: This revision was merged to the branch mainline in revision 1398.
Revision ID: mordred@inaugust.com-20100323102809-r9o45nvkyvyi7jsg

Took the last suggestion from Diego and used a library that doesn't have
crazy symbol conflict issues (or the unclean-header problem that openssl
has)

Also, it's lgpl and not oddly licensed.

files modified:
plugin/md5/md5.cc

plugin/md5/plugin.ac

plugin/md5/plugin.ini

Show diffs side-by-side

added added

removed removed

plugin/md5/md5.cc

#include "config.h"

/* Include these before the openssl headers, because they are BROKEN AS CRAP */

#include <cstdio>

#include <cstddef>

#if defined(HAVE_LIBGNUTLS_OPENSSL)

# include <gnutls/openssl.h>

#else

# include <openssl/md5.h>

#endif /* HAVE_GNUTLS_OPENSSL */

#include <gcrypt.h>

#include <drizzled/plugin/function.h>

#include <drizzled/item/func.h>

unsigned char digest[16];

str->set_charset(&my_charset_bin);

MD5_CTX context;

MD5_Init(&context);

MD5_Update(&context, (unsigned char *) sptr->ptr(), sptr->length());

MD5_Final(digest, &context);

gcry_md_hash_buffer(GCRY_MD_MD5, digest, sptr->ptr(), sptr->length());

snprintf((char *) str->ptr(), 33,

"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",

Older »