1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

- Fix compile w/ CLANG

upstream openssl changed the return type of openssl HMAC_CTX_copy from void to int
- The resultant binary is unaffected, so no PORTREVISION bump

Tested by:      md5 ruby18
Tested by:      make test-all
With Hat:       ruby@
This commit is contained in:
Philip M. Gollucci 2012-01-18 03:05:24 +00:00
parent 786b1f0d38
commit 115595bcde
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=289394

View File

@ -1,6 +1,6 @@
--- ext/openssl/openssl_missing.c.orig 2008-05-19 05:00:52.000000000 +0200
+++ ext/openssl/openssl_missing.c 2010-04-06 14:20:20.000000000 +0200
@@ -22,7 +22,7 @@
--- ./ext/openssl/openssl_missing.c.orig 2008-05-19 03:00:52.000000000 +0000
+++ ./ext/openssl/openssl_missing.c 2012-01-17 05:09:13.816807984 +0000
@@ -22,15 +22,16 @@
#include "openssl_missing.h"
#if !defined(HAVE_HMAC_CTX_COPY)
@ -8,8 +8,10 @@
+int
HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
{
if (!out || !in) return;
@@ -31,6 +31,7 @@
- if (!out || !in) return;
+ if (!out || !in) return 0;
memcpy(out, in, sizeof(HMAC_CTX));
EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx);
EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx);
EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx);