cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dns/powerdns: update to 4.6.1

Browse Source 
Fixes CVE-2022-27227

PR:	262879
Reported by:	Ralf van der Enden <tremere@cainites.net> (maintainer)
MFH:	2022Q2 (security fix)
Security:	CVE-2022-27227
This commit is contained in:
Ralf van der Enden 2022-04-05 12:08:23 +02:00 committed by Fernando Apesteguía
parent 97cb4ebc08
commit 79872ab609
3 changed files with 105 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dns/powerdns/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= powerdns
DISTVERSION= 4.6.0
DISTVERSION= 4.6.1
CATEGORIES= dns
MASTER_SITES= https://downloads.powerdns.com/releases/
DISTNAME= pdns-${DISTVERSION}

6
dns/powerdns/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1648050226
SHA256 (pdns-4.6.0.tar.bz2) = b9effb7968a7badbb91eea431c73346482a67592684d84660edd8b7528cc1325
SIZE (pdns-4.6.0.tar.bz2) = 1299604
TIMESTAMP = 1648224641
SHA256 (pdns-4.6.1.tar.bz2) = 7912b14887d62845185f7ce4b47db580eaa7b8b897dcb1c9555dfe0fac5efae3
SIZE (pdns-4.6.1.tar.bz2) = 1315530

101
dns/powerdns/files/patch-credentials.cc Normal file
View File

@ -0,0 +1,101 @@
--- pdns/credentials.cc.orig 2021-11-23 18:39:17 UTC
+++ pdns/credentials.cc
@@ -28,7 +28,7 @@
#include <sodium.h>
#endif
-#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT
+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT)
#include <openssl/evp.h>
#include <openssl/kdf.h>
#include <openssl/rand.h>
@@ -42,7 +42,7 @@
#include "credentials.hh"
#include "misc.hh"
-#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT
+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT)
static size_t const pwhash_max_size = 128U; /* maximum size of the output */
static size_t const pwhash_output_size = 32U; /* size of the hashed output (before base64 encoding) */
static unsigned int const pwhash_salt_size = 16U; /* size of the salt (before base64 encoding */
@@ -95,7 +95,7 @@ void SensitiveData::clear()
static std::string hashPasswordInternal(const std::string& password, const std::string& salt, uint64_t workFactor, uint64_t parallelFactor, uint64_t blockSize)
{
-#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT
+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT)
auto pctx = std::unique_ptr<EVP_PKEY_CTX, void (*)(EVP_PKEY_CTX*)>(EVP_PKEY_CTX_new_id(EVP_PKEY_SCRYPT, nullptr), EVP_PKEY_CTX_free);
if (!pctx) {
throw std::runtime_error("Error getting a scrypt context to hash the supplied password");
@@ -142,7 +142,7 @@ static std::string hashPasswordInternal(const std::str
static std::string generateRandomSalt()
{
-#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT
+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT)
/* generate a random salt */
std::string salt;
salt.resize(pwhash_salt_size);
@@ -159,7 +159,7 @@ static std::string generateRandomSalt()
std::string hashPassword(const std::string& password, uint64_t workFactor, uint64_t parallelFactor, uint64_t blockSize)
{
-#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT
+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT)
std::string result;
result.reserve(pwhash_max_size);
@@ -187,7 +187,7 @@ std::string hashPassword(const std::string& password,
std::string hashPassword(const std::string& password)
{
-#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT
+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT)
return hashPassword(password, CredentialsHolder::s_defaultWorkFactor, CredentialsHolder::s_defaultParallelFactor, CredentialsHolder::s_defaultBlockSize);
#else
throw std::runtime_error("Hashing a password requires scrypt support in OpenSSL, and it is not available");
@@ -196,7 +196,7 @@ std::string hashPassword(const std::string& password)
bool verifyPassword(const std::string& binaryHash, const std::string& salt, uint64_t workFactor, uint64_t parallelFactor, uint64_t blockSize, const std::string& binaryPassword)
{
-#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT
+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT)
auto expected = hashPasswordInternal(binaryPassword, salt, workFactor, parallelFactor, blockSize);
return constantTimeStringEquals(expected, binaryHash);
#else
@@ -207,7 +207,7 @@ bool verifyPassword(const std::string& binaryHash, con
/* parse a hashed password in PHC string format */
static void parseHashed(const std::string& hash, std::string& salt, std::string& hashedPassword, uint64_t& workFactor, uint64_t& parallelFactor, uint64_t& blockSize)
{
-#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT
+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT)
auto parametersEnd = hash.find('$', pwhash_prefix.size());
if (parametersEnd == std::string::npos || parametersEnd == hash.size()) {
throw std::runtime_error("Invalid hashed password format, no parameters");
@@ -276,7 +276,7 @@ bool verifyPassword(const std::string& hash, const std
return false;
}
-#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT
+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT)
std::string salt;
std::string hashedPassword;
uint64_t workFactor = 0;
@@ -294,7 +294,7 @@ bool verifyPassword(const std::string& hash, const std
bool isPasswordHashed(const std::string& password)
{
-#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT
+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT)
if (password.size() < pwhash_prefix_size || password.size() > pwhash_max_size) {
return false;
}
@@ -389,7 +389,7 @@ bool CredentialsHolder::matches(const std::string& pas
bool CredentialsHolder::isHashingAvailable()
{
-#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT
+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT)
return true;
#else
return false;