[xmlsec/xmlsec-openssl-110: 9/9] convert openssl/signature.c (disable dsa and ecdsa for now) to OpenSSL 1.1.0
- From: Aleksey Sanin <aleksey src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [xmlsec/xmlsec-openssl-110: 9/9] convert openssl/signature.c (disable dsa and ecdsa for now) to OpenSSL 1.1.0
- Date: Thu, 28 Jan 2016 17:12:58 +0000 (UTC)
commit 37eee5633835e20ce1d288dee416de7a26569bb1
Author: Aleksey Sanin <aleksey aleksey com>
Date: Thu Jan 28 00:06:43 2016 -0800
convert openssl/signature.c (disable dsa and ecdsa for now) to OpenSSL 1.1.0
configure.in | 2 +-
src/openssl/signatures.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index 48323ef..cff3348 100644
--- a/configure.in
+++ b/configure.in
@@ -519,7 +519,7 @@ if test "z$OPENSSL_FOUND" = "zyes" ; then
OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_OPENSSL_100=1"
fi
if test "z$OPENSSL_VERSION" = "z1.1.0" ; then
- OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_OPENSSL_110=1"
+ OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_OPENSSL_110=1 -DXMLSEC_NO_ECDSA=1 -DXMLSEC_NO_DSA=1"
fi
OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_CRYPTO_OPENSSL=1"
XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST openssl"
diff --git a/src/openssl/signatures.c b/src/openssl/signatures.c
index 4883ade..46a843b 100644
--- a/src/openssl/signatures.c
+++ b/src/openssl/signatures.c
@@ -952,9 +952,9 @@ static const EVP_MD xmlSecOpenSSLDsaSha1MdEvp = {
{EVP_PKEY_DSA,EVP_PKEY_DSA2,EVP_PKEY_DSA3,EVP_PKEY_DSA4,0},
SHA_CBLOCK,
sizeof(EVP_MD *)+sizeof(SHA_CTX)
-#if defined(XMLSEC_OPENSSL_100) || defined(XMLSEC_OPENSSL_110)
+#if defined(XMLSEC_OPENSSL_100)
, NULL
-#endif /* defined(XMLSEC_OPENSSL_100) || defined(XMLSEC_OPENSSL_110) */
+#endif /* defined(XMLSEC_OPENSSL_100) */
};
static const EVP_MD *xmlSecOpenSSLDsaSha1Evp(void)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]