From f40eb59a1ae964fa74d4f4eca2508cc4a076bb10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sun, 14 Apr 2019 12:01:38 -0400
Subject: [PATCH] contrib: update OpenDHT
Change-Id: Iaa990413942dba0492ebd012427c0e9010b3c521
---
contrib/src/opendht/SHA512SUMS | 2 +-
contrib/src/opendht/fetch_and_patch.bat | 2 +-
contrib/src/opendht/rules.mak | 2 +-
src/security/certstore.cpp | 4 ++--
src/security/certstore.h | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/contrib/src/opendht/SHA512SUMS b/contrib/src/opendht/SHA512SUMS
index 23b5249ed5..73c65b04c2 100644
--- a/contrib/src/opendht/SHA512SUMS
+++ b/contrib/src/opendht/SHA512SUMS
@@ -1 +1 @@
-9bbef0a9ccf87af8f20439c4cc3654ba34f985d3f09a378085e7fcfa4d6571c1545f733550d85ebbac0e6b367b4ffaf26b7c93da5e7d7a9707cef9851b916893 opendht-1ac4e08f455146f1e22478452e503dcb35688cc7.tar.gz
+2e78132097e839cace59fa9d926621854107af2486cee55d76f24176b3f3c86be99d1e388bbb604cde8f2490f4e9cc3e7dc9ccfc868f951e3dac1e6ba8a25a72 opendht-ef82652a1e9417cd20df3bf55f569aee26b6e6a8.tar.gz
diff --git a/contrib/src/opendht/fetch_and_patch.bat b/contrib/src/opendht/fetch_and_patch.bat
index d7604af246..163ff2947b 100644
--- a/contrib/src/opendht/fetch_and_patch.bat
+++ b/contrib/src/opendht/fetch_and_patch.bat
@@ -1,6 +1,6 @@
set BUILD=%SRC%..\build
-set OPENDHT_VERSION=d523e9f259aa2e90e0c56b7f66324422422c9e2b
+set OPENDHT_VERSION=ef82652a1e9417cd20df3bf55f569aee26b6e6a8
set OPENDHT_URL=https://github.com/savoirfairelinux/opendht/archive/%OPENDHT_VERSION%.tar.gz
mkdir %BUILD%
diff --git a/contrib/src/opendht/rules.mak b/contrib/src/opendht/rules.mak
index 69e9e5184e..aa865619d6 100644
--- a/contrib/src/opendht/rules.mak
+++ b/contrib/src/opendht/rules.mak
@@ -1,5 +1,5 @@
# OPENDHT
-OPENDHT_VERSION := 1ac4e08f455146f1e22478452e503dcb35688cc7
+OPENDHT_VERSION := ef82652a1e9417cd20df3bf55f569aee26b6e6a8
OPENDHT_URL := https://github.com/savoirfairelinux/opendht/archive/$(OPENDHT_VERSION).tar.gz
PKGS += opendht
diff --git a/src/security/certstore.cpp b/src/security/certstore.cpp
index eda44bc07a..291e6afd2a 100644
--- a/src/security/certstore.cpp
+++ b/src/security/certstore.cpp
@@ -118,13 +118,13 @@ CertificateStore::getCertificate(const std::string& k) const
}
std::shared_ptr<crypto::Certificate>
-CertificateStore::findCertificateByName(const std::string& name, crypto::Certificate::NameType type) const
+CertificateStore::findCertificateByName(const std::string& name, crypto::NameType type) const
{
std::unique_lock<std::mutex> l(lock_);
for (auto& i : certs_) {
if (i.second->getName() == name)
return i.second;
- if (type != crypto::Certificate::NameType::UNKNOWN) {
+ if (type != crypto::NameType::UNKNOWN) {
for (const auto& alt : i.second->getAltNames())
if (alt.first == type and alt.second == name)
return i.second;
diff --git a/src/security/certstore.h b/src/security/certstore.h
index c4442b7cda..0981efab94 100644
--- a/src/security/certstore.h
+++ b/src/security/certstore.h
@@ -57,7 +57,7 @@ public:
std::vector<std::string> getPinnedCertificates() const;
std::shared_ptr<crypto::Certificate> getCertificate(const std::string& cert_id) const;
- std::shared_ptr<crypto::Certificate> findCertificateByName(const std::string& name, crypto::Certificate::NameType type = crypto::Certificate::NameType::UNKNOWN) const;
+ std::shared_ptr<crypto::Certificate> findCertificateByName(const std::string& name, crypto::NameType type = crypto::NameType::UNKNOWN) const;
std::shared_ptr<crypto::Certificate> findCertificateByUID(const std::string& uid) const;
std::shared_ptr<crypto::Certificate> findIssuer(const std::shared_ptr<crypto::Certificate>& crt) const;
--
GitLab