You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ph...@apache.org on 2017/09/28 14:30:00 UTC
nifi-minifi-cpp git commit: MINIFI-388 Backport the rest of
EVP_Digest for civetweb
Repository: nifi-minifi-cpp
Updated Branches:
refs/heads/master 8b3b1c880 -> aaeb929b2
MINIFI-388 Backport the rest of EVP_Digest for civetweb
This closes #139.
Signed-off-by: Marc Parisi <ph...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/aaeb929b
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/aaeb929b
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/aaeb929b
Branch: refs/heads/master
Commit: aaeb929b289f5c5f9a10811c37a183f2783e93e1
Parents: 8b3b1c8
Author: Caleb Johnson <me...@calebj.io>
Authored: Thu Sep 28 11:25:18 2017 +0000
Committer: Marc Parisi <ph...@apache.org>
Committed: Thu Sep 28 10:29:31 2017 -0400
----------------------------------------------------------------------
thirdparty/civetweb-1.9.1/src/civetweb.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/aaeb929b/thirdparty/civetweb-1.9.1/src/civetweb.c
----------------------------------------------------------------------
diff --git a/thirdparty/civetweb-1.9.1/src/civetweb.c b/thirdparty/civetweb-1.9.1/src/civetweb.c
index ba916da..1aa0de6 100644
--- a/thirdparty/civetweb-1.9.1/src/civetweb.c
+++ b/thirdparty/civetweb-1.9.1/src/civetweb.c
@@ -1376,12 +1376,10 @@ struct ssl_func {
(*(int (*)(ASN1_INTEGER *, unsigned char **))crypto_sw[16].ptr)
#define EVP_get_digestbyname \
(*(const EVP_MD *(*)(const char *))crypto_sw[17].ptr)
-#define ASN1_digest \
- (*(int (*)(int (*)(), \
- const EVP_MD *, \
- char *, \
- unsigned char *, \
- unsigned int *))crypto_sw[18].ptr)
+#define EVP_Digest \
+ (*(int (*)( \
+ const void *, size_t, void *, unsigned int *, const EVP_MD *, void *)) \
+ crypto_sw[18].ptr)
#define i2d_X509 (*(int (*)(X509 *, unsigned char **))crypto_sw[19].ptr)
@@ -1444,7 +1442,7 @@ static struct ssl_func crypto_sw[] = {{"CRYPTO_num_locks", NULL},
{"X509_get_serialNumber", NULL},
{"i2c_ASN1_INTEGER", NULL},
{"EVP_get_digestbyname", NULL},
- {"ASN1_digest", NULL},
+ {"EVP_Digest", NULL},
{"i2d_X509", NULL},
{NULL, NULL}};
#endif /* NO_SSL_DL */