xeus/184.patch
Elliott Sales de Andrade d090011b40 Initial import (#1750069).
2019-09-23 17:50:04 -04:00

37 lines
1.4 KiB
Diff

From aba9b9899f38849f6ac6ad668c72083efd92e4c9 Mon Sep 17 00:00:00 2001
From: Sylvain Corlay <sylvain.corlay@gmail.com>
Date: Thu, 5 Sep 2019 00:31:00 +0200
Subject: [PATCH] Do not use MDC2
---
CMakeLists.txt | 2 +-
src/xauthentication.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb91263..a331df6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ message(STATUS "xeus binary version: v${XEUS_BINARY_VERSION}")
set(nlohmann_json_REQUIRED_VERSION 3.2.0)
set(xtl_REQUIRED_VERSION 0.5)
set(cppzmq_REQUIRED_VERSION 4.3.0)
-set(zeromq_REQUIRED_VERSION 4.2.3)
+set(zeromq_REQUIRED_VERSION 4.2.5)
find_package(nlohmann_json ${nlohmann_json_REQUIRED_VERSION} REQUIRED)
find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED)
diff --git a/src/xauthentication.cpp b/src/xauthentication.cpp
index 8039fa9..ff95141 100644
--- a/src/xauthentication.cpp
+++ b/src/xauthentication.cpp
@@ -108,7 +108,8 @@ namespace xeus
static const std::map<std::string, const EVP_MD*(*)()> schemes = {
{"hmac-md5", EVP_md5},
{"hmac-sha1", EVP_sha1},
- {"hmac-mdc2", EVP_mdc2},
+ // MDC2 is disabled by default unless enable-mdc2 is specified
+ // {"hmac-mdc2", EVP_mdc2},
{"hmac-ripemd160", EVP_ripemd160},
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
{"hmac-blake2b512", EVP_blake2b512},