From 6b8f1dd1a21ce49319795391e21adf645b64db3c Mon Sep 17 00:00:00 2001 From: "Alexander V. Lukyanov" Date: Thu, 12 Dec 2013 11:19:29 +0000 Subject: [PATCH] md5, sha1, sha256, sha512: fix compile error in c++ mode * lib/gl_openssl.h: Cast void pointers to a specific type. --- ChangeLog | 5 +++++ lib/gl_openssl.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82a632ad9..ea8b1ab03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-12-12 Alexander V. Lukyanov + + md5, sha1, sha256, sha512: fix (trivial) compile error in c++ mode. + * lib/gl_openssl.h: Cast void pointers to a specific type. + 2013-12-07 Pádraig Brady open-tests: fix build failure with -Werror=old-style-declaration diff --git a/lib/gl_openssl.h b/lib/gl_openssl.h index 1fb61066b..bcdbbefc6 100644 --- a/lib/gl_openssl.h +++ b/lib/gl_openssl.h @@ -91,18 +91,18 @@ GL_CRYPTO_FN (_process_block) (const void *buf, size_t len, struct _gl_ctx *ctx) GL_OPENSSL_INLINE void * GL_CRYPTO_FN (_finish_ctx) (struct _gl_ctx *ctx, void *res) -{ OPENSSL_FN (_Final) (res, (_gl_CTX *) ctx); return res; } +{ OPENSSL_FN (_Final) ((unsigned char *) res, (_gl_CTX *) ctx); return res; } GL_OPENSSL_INLINE void * GL_CRYPTO_FN (_buffer) (const char *buf, size_t len, void *res) -{ return OPENSSL_FN () ((const unsigned char *) buf, len, res); } +{ return OPENSSL_FN () ((const unsigned char *) buf, len, (unsigned char *) res); } GL_OPENSSL_INLINE void * GL_CRYPTO_FN (_read_ctx) (const struct _gl_ctx *ctx, void *res) { /* Assume any unprocessed bytes in ctx are not to be ignored. */ _gl_CTX tmp_ctx = *(_gl_CTX *) ctx; - OPENSSL_FN (_Final) (res, &tmp_ctx); + OPENSSL_FN (_Final) ((unsigned char *) res, &tmp_ctx); return res; } -- 2.11.0