else
CRYPTO_NAME="OpenSSL"
DISABLED_CRYPTO="Botan"
- CRYPTO_PACKAGE="openssl-1.0.0"
+ CRYPTO_PACKAGE="openssl-1.0.2"
AC_DEFINE_UNQUOTED([WITH_OPENSSL], [], [Compile with OpenSSL crypto])
AC_MSG_CHECKING(for OpenSSL library)
# from bind9
fi
AC_MSG_RESULT(yes)
if test "${use_openssl}" = "/usr" ; then
+ CRYPTO_CFLAGS=""
CRYPTO_INCLUDES=""
CRYPTO_LIBS="-lcrypto"
DISTCHECK_CRYPTO_CONFIGURE_FLAG="--with-openssl"
- case "$host" in
- *-apple-darwin*)
- # Starting with OSX 10.7 (Lion) OpenSSL is deprecated
- CRYPTO_CFLAGS="-Wno-deprecated-declarations"
- ;;
- *)
- CRYPTO_CFLAGS=""
- ;;
- esac
else
CRYPTO_CFLAGS=""
CRYPTO_INCLUDES="-I${use_openssl}/include"
esac
fi
dnl Determine the OpenSSL version
+ # Officially we support >= 1.0.1, 0.9.8 should fail the HMAC API,
+ # 1.0.0 could work but is not recommended.
AC_MSG_CHECKING([OpenSSL version])
cat > conftest.cpp << EOF
#include <openssl/opensslv.h>
])],
[AC_MSG_RESULT([yes])],
[AC_MSG_ERROR([missing EVP entry for SHA-2])])
+ dnl Check HMAC API
+ AC_MSG_CHECKING([HMAC functions returning ints])
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([#include <openssl/hmac.h>],
+ [HMAC_CTX ctx, tmp;
+ int n = HMAC_Init(&ctx, NULL, 0, NULL);
+ n += HMAC_Update(&ctx, NULL, 0);
+ n += HMAC_CTX_copy(&tmp, &ctx);
+ n += HMAC_Final(&tmp, NULL, NULL);
+ ])],
+ [AC_MSG_RESULT([yes])],
+ [AC_MSG_ERROR([HMAC functions return void: the OpenSSL version should be too old, please change for >= 1.0.1])])
LIBS=${LIBS_SAVED}
CPPFLAGS=${CPPFLAGS_SAVED}
fi
AC_SUBST(GTEST_LDADD)
AC_SUBST(GTEST_SOURCE)
+#
+# Some Googletest versions bug with C++11 compilers
+#
+if test $enable_gtest != "no"; then
+ AC_MSG_CHECKING([if Google Test is compatible with the compiler])
+ CPPFLAGS_SAVED=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $GTEST_INCLUDES"
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [#include <boost/shared_ptr.hpp>
+ #include <gtest/gtest.h>
+ void foo() {
+ boost::shared_ptr<int> bar;
+ ASSERT_TRUE(bar);
+ }],
+ [return 0;])],
+ [AC_MSG_RESULT(yes)],
+ [AC_MSG_ERROR([XXX_TRUE() Gtest macros won't compile: please use a different version of Gtest, e.g., git one])])
+ CPPFLAGS=$CPPFLAGS_SAVED
+fi
+
#
# ASIO: we extensively use it as the C++ event management module.
#
</para>
</listitem>
- <listitem>
+ <listitem>
<para>
- Botan (at least version 1.8) or OpenSSL.</para>
+ Botan (at least version 1.8) or OpenSSL (at least version 1.0.1).
+ </para>
</listitem>
<listitem>
is required to be installed during compilation. Kea uses the Botan
crypto library for C++ (<ulink url="http://botan.randombit.net/"/>),
version 1.8 or later. As an alternative to Botan, Kea can use the
- OpenSSL crypto library (<ulink url="http://www.openssl.org/"/>).
- It requires a version with SHA-2 support.
+ OpenSSL crypto library (<ulink url="http://www.openssl.org/"/>),
+ version 1.0.1 or later.
</simpara>
</listitem>
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
/// @brief Constructor for specific hash algorithm
///
/// @param hash_algorithm The hash algorithm
- explicit HashImpl(const HashAlgorithm hash_algorithm) {
+ explicit HashImpl(const HashAlgorithm hash_algorithm)
+ : hash_algorithm_(hash_algorithm), hash_() {
Botan::HashFunction* hash;
try {
hash = Botan::get_hash(btn::getHashAlgorithmName(hash_algorithm));
/// @brief Destructor
~HashImpl() { }
+ /// @brief Returns the HashAlgorithm of the object
+ HashAlgorithm getHashAlgorithm() const {
+ return (hash_algorithm_);
+ }
+
/// @brief Returns the output size of the digest
///
/// @return output size of the digest
}
private:
- /// \brief The protected pointer to the Botan HashFunction object
+ /// @brief The hash algorithm
+ HashAlgorithm hash_algorithm_;
+
+ /// @brief The protected pointer to the Botan HashFunction object
boost::scoped_ptr<Botan::HashFunction> hash_;
};
delete impl_;
}
+HashAlgorithm
+Hash::getHashAlgorithm() const {
+ return (impl_->getHashAlgorithm());
+}
+
size_t
Hash::getOutputLength() const {
return (impl_->getOutputLength());
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
/// @param secret_len The length of the secret
/// @param hash_algorithm The hash algorithm
explicit HMACImpl(const void* secret, size_t secret_len,
- const HashAlgorithm hash_algorithm) {
+ const HashAlgorithm hash_algorithm)
+ : hash_algorithm_(hash_algorithm), hmac_() {
Botan::HashFunction* hash;
try {
hash = Botan::get_hash(btn::getHashAlgorithmName(hash_algorithm));
} catch (const Botan::Algorithm_Not_Found&) {
- isc_throw(isc::cryptolink::UnsupportedAlgorithm,
+ isc_throw(UnsupportedAlgorithm,
"Unknown hash algorithm: " <<
static_cast<int>(hash_algorithm));
} catch (const Botan::Exception& exc) {
- isc_throw(isc::cryptolink::LibraryError, exc.what());
+ isc_throw(LibraryError, exc.what());
}
hmac_.reset(new Botan::HMAC(hash));
} catch (const Botan::Invalid_Key_Length& ikl) {
isc_throw(BadKey, ikl.what());
} catch (const Botan::Exception& exc) {
- isc_throw(isc::cryptolink::LibraryError, exc.what());
+ isc_throw(LibraryError, exc.what());
}
}
~HMACImpl() {
}
+ /// @brief Returns the HashAlgorithm of the object
+ HashAlgorithm getHashAlgorithm() const {
+ return (hash_algorithm_);
+ }
+
/// @brief Returns the output size of the digest
///
/// @return output size of the digest
try {
hmac_->update(static_cast<const Botan::byte*>(data), len);
} catch (const Botan::Exception& exc) {
- isc_throw(isc::cryptolink::LibraryError, exc.what());
+ isc_throw(LibraryError, exc.what());
}
}
}
result.writeData(b_result.begin(), len);
} catch (const Botan::Exception& exc) {
- isc_throw(isc::cryptolink::LibraryError, exc.what());
+ isc_throw(LibraryError, exc.what());
}
}
}
std::memcpy(result, b_result.begin(), output_size);
} catch (const Botan::Exception& exc) {
- isc_throw(isc::cryptolink::LibraryError, exc.what());
+ isc_throw(LibraryError, exc.what());
}
}
return (std::vector<uint8_t>(b_result.begin(), &b_result[len]));
}
} catch (const Botan::Exception& exc) {
- isc_throw(isc::cryptolink::LibraryError, exc.what());
+ isc_throw(LibraryError, exc.what());
}
}
/// which causes it to fail for truncated signatures, so we do
/// the check ourselves
try {
- Botan::SecureVector<Botan::byte> our_mac = hmac_->final();
size_t size = getOutputLength();
if (len < 10 || len < size / 2) {
return (false);
if (len > size) {
len = size;
}
- return (Botan::same_mem(&our_mac[0],
+ if (digest_.empty()) {
+ digest_ = hmac_->final();
+ }
+ return (Botan::same_mem(&digest_[0],
static_cast<const unsigned char*>(sig),
len));
} catch (const Botan::Exception& exc) {
- isc_throw(isc::cryptolink::LibraryError, exc.what());
+ isc_throw(LibraryError, exc.what());
}
}
private:
- /// \brief The protected pointer to the Botan HMAC object
+ /// @brief The hash algorithm
+ HashAlgorithm hash_algorithm_;
+
+ /// @brief The protected pointer to the Botan HMAC object
boost::scoped_ptr<Botan::HMAC> hmac_;
+
+ /// @brief The digest cache for multiple verify
+ Botan::SecureVector<Botan::byte> digest_;
};
HMAC::HMAC(const void* secret, size_t secret_length,
delete impl_;
}
+HashAlgorithm
+HMAC::getHashAlgorithm() const {
+ return (impl_->getHashAlgorithm());
+}
+
size_t
HMAC::getOutputLength() const {
return (impl_->getOutputLength());
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
/// \brief Destructor
~Hash();
+ /// \brief Returns the HashAlgorithm of the object
+ HashAlgorithm getHashAlgorithm() const;
+
/// \brief Returns the output size of the digest
///
/// \return output size of the digest
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
/// \brief Destructor
~HMAC();
+ /// \brief Returns the HashAlgorithm of the object
+ HashAlgorithm getHashAlgorithm() const;
+
/// \brief Returns the output size of the digest
///
/// \return output size of the digest
/// result
void sign(void* result, size_t len);
- /// \brief Calculate the final signatre
+ /// \brief Calculate the final signature
///
/// The result will be returned as a std::vector<uint8_t>
///
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
vec_.resize(sz);
};
+ void clear() {
+ std::memset(&vec_[0], 0, vec_.capacity() * sizeof(T));
+ vec_.clear();
+ }
+
SecBuf& operator=(const SecBuf& x) {
if (&x != *this) {
vec_ = x.vec_;
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
/// @brief Constructor for specific hash algorithm
///
/// @param hash_algorithm The hash algorithm
- explicit HashImpl(const HashAlgorithm hash_algorithm) {
+ explicit HashImpl(const HashAlgorithm hash_algorithm)
+ : hash_algorithm_(hash_algorithm), md_() {
const EVP_MD* algo = ossl::getHashAlgorithm(hash_algorithm);
if (algo == 0) {
isc_throw(isc::cryptolink::UnsupportedAlgorithm,
}
}
+ /// @brief Returns the HashAlgorithm of the object
+ HashAlgorithm getHashAlgorithm() const {
+ return (hash_algorithm_);
+ }
+
/// @brief Returns the output size of the digest
///
/// @return output size of the digest
}
private:
+ /// @brief The hash algorithm
+ HashAlgorithm hash_algorithm_;
+
/// @brief The protected pointer to the OpenSSL EVP_MD_CTX structure
boost::scoped_ptr<EVP_MD_CTX> md_;
};
delete impl_;
}
+HashAlgorithm
+Hash::getHashAlgorithm() const {
+ return (impl_->getHashAlgorithm());
+}
+
size_t
Hash::getOutputLength() const {
return (impl_->getOutputLength());
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
/// @param secret_len The length of the secret
/// @param hash_algorithm The hash algorithm
explicit HMACImpl(const void* secret, size_t secret_len,
- const HashAlgorithm hash_algorithm) {
+ const HashAlgorithm hash_algorithm)
+ : hash_algorithm_(hash_algorithm), md_() {
const EVP_MD* algo = ossl::getHashAlgorithm(hash_algorithm);
if (algo == 0) {
isc_throw(UnsupportedAlgorithm,
md_.reset(new HMAC_CTX);
HMAC_CTX_init(md_.get());
- HMAC_Init_ex(md_.get(), secret,
- static_cast<int>(secret_len),
- algo, NULL);
+ if (!HMAC_Init_ex(md_.get(), secret,
+ static_cast<int>(secret_len),
+ algo, NULL)) {
+ isc_throw(LibraryError, "HMAC_Init_ex");
+ }
}
/// @brief Destructor
}
}
+ /// @brief Returns the HashAlgorithm of the object
+ HashAlgorithm getHashAlgorithm() const {
+ return (hash_algorithm_);
+ }
+
/// @brief Returns the output size of the digest
///
/// @return output size of the digest
size_t getOutputLength() const {
int size = HMAC_size(md_.get());
if (size < 0) {
- isc_throw(isc::cryptolink::LibraryError, "EVP_MD_CTX_size");
+ isc_throw(LibraryError, "HMAC_size");
}
return (static_cast<size_t>(size));
}
///
/// See @ref isc::cryptolink::HMAC::update() for details.
void update(const void* data, const size_t len) {
- HMAC_Update(md_.get(), static_cast<const unsigned char*>(data), len);
+ if (!HMAC_Update(md_.get(),
+ static_cast<const unsigned char*>(data),
+ len)) {
+ isc_throw(LibraryError, "HMAC_Update");
+ }
}
/// @brief Calculate the final signature
void sign(isc::util::OutputBuffer& result, size_t len) {
size_t size = getOutputLength();
ossl::SecBuf<unsigned char> digest(size);
- HMAC_Final(md_.get(), &digest[0], NULL);
+ if (!HMAC_Final(md_.get(), &digest[0], NULL)) {
+ isc_throw(LibraryError, "HMAC_Final");
+ }
if (len > size) {
len = size;
}
void sign(void* result, size_t len) {
size_t size = getOutputLength();
ossl::SecBuf<unsigned char> digest(size);
- HMAC_Final(md_.get(), &digest[0], NULL);
+ if (!HMAC_Final(md_.get(), &digest[0], NULL)) {
+ isc_throw(LibraryError, "HMAC_Final");
+ }
if (len > size) {
len = size;
}
std::vector<uint8_t> sign(size_t len) {
size_t size = getOutputLength();
ossl::SecBuf<unsigned char> digest(size);
- HMAC_Final(md_.get(), &digest[0], NULL);
+ if (!HMAC_Final(md_.get(), &digest[0], NULL)) {
+ isc_throw(LibraryError, "HMAC_Final");
+ }
if (len < size) {
digest.resize(len);
}
///
/// See @ref isc::cryptolink::HMAC::verify() for details.
bool verify(const void* sig, size_t len) {
+ // Check the length
size_t size = getOutputLength();
if (len < 10 || len < size / 2) {
return (false);
}
+ // Get the digest from a copy of the context
+ HMAC_CTX tmp;
+ HMAC_CTX_init(&tmp);
+ if (!HMAC_CTX_copy(&tmp, md_.get())) {
+ isc_throw(LibraryError, "HMAC_CTX_copy");
+ }
ossl::SecBuf<unsigned char> digest(size);
- HMAC_Final(md_.get(), &digest[0], NULL);
+ if (!HMAC_Final(&tmp, &digest[0], NULL)) {
+ HMAC_CTX_cleanup(&tmp);
+ isc_throw(LibraryError, "HMAC_Final");
+ }
+ HMAC_CTX_cleanup(&tmp);
if (len > size) {
len = size;
}
}
private:
+ /// @brief The hash algorithm
+ HashAlgorithm hash_algorithm_;
/// @brief The protected pointer to the OpenSSL HMAC_CTX structure
boost::scoped_ptr<HMAC_CTX> md_;
delete impl_;
}
+HashAlgorithm
+HMAC::getHashAlgorithm() const {
+ return (impl_->getHashAlgorithm());
+}
+
size_t
HMAC::getOutputLength() const {
return (impl_->getOutputLength());
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
SHA512, hash_expected4, 64);
}
+namespace {
+ /// @brief Get the hash algorithm
+ /// @param alg Hash algorithm enum
+ /// @return Hash algorithm enum
+ HashAlgorithm
+ digestHashAlgorithm(HashAlgorithm alg) {
+ boost::shared_ptr<Hash> hash_digest(
+ CryptoLink::getCryptoLink().createHash(alg),
+ deleteHash);
+ return (hash_digest->getHashAlgorithm());
+ }
+}
+
+TEST(HashTest, HashAlgorithm) {
+ EXPECT_EQ(MD5, digestHashAlgorithm(MD5));
+ EXPECT_EQ(SHA1, digestHashAlgorithm(SHA1));
+ EXPECT_EQ(SHA256, digestHashAlgorithm(SHA256));
+ EXPECT_EQ(SHA224, digestHashAlgorithm(SHA224));
+ EXPECT_EQ(SHA384, digestHashAlgorithm(SHA384));
+ EXPECT_EQ(SHA512, digestHashAlgorithm(SHA512));
+}
+
namespace {
/// @brief Compute the vector digest length
/// @param alg Hash algorithm enum
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
hmac_sig.writeUint8At(~hmac_sig[0], 0);
EXPECT_FALSE(hmac_verify->verify(hmac_sig.getData(),
hmac_sig.getLength()));
+
+ // Restore the sig by flipping the first octet, and check
+ // whether verification succeeds then
+ hmac_sig.writeUint8At(~hmac_sig[0], 0);
+ EXPECT_TRUE(hmac_verify->verify(hmac_sig.getData(),
+ hmac_sig.getLength()));
}
/// @brief Sign and verify with vector representation of signature
sig[0] = ~sig[0];
EXPECT_FALSE(hmac_verify->verify(sig, hmac_len));
+ sig[0] = ~sig[0];
+ EXPECT_TRUE(hmac_verify->verify(sig, hmac_len));
+
delete[] sig;
}
hmac_expected5, 16);
}
+namespace {
+ /// @brief Get the hash algorithm
+ /// @param alg Hash algorithm enum
+ /// @return Hash algorithm enum
+ HashAlgorithm
+ signHashAlgorithm(HashAlgorithm alg) {
+ boost::shared_ptr<HMAC> hmac_sign(
+ CryptoLink::getCryptoLink().createHMAC("asdf", 4, alg),
+ deleteHMAC);
+ return (hmac_sign->getHashAlgorithm());
+ }
+}
+
+TEST(HMACTest, HashAlgorithm) {
+ EXPECT_EQ(MD5, signHashAlgorithm(MD5));
+ EXPECT_EQ(SHA1, signHashAlgorithm(SHA1));
+ EXPECT_EQ(SHA256, signHashAlgorithm(SHA256));
+ EXPECT_EQ(SHA224, signHashAlgorithm(SHA224));
+ EXPECT_EQ(SHA384, signHashAlgorithm(SHA384));
+ EXPECT_EQ(SHA512, signHashAlgorithm(SHA512));
+}
+
namespace {
/// @brief Compute the vector signature length
/// @param alg Hash algorithm enum
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include <gtest/gtest.h>
+#include <log/logger_support.h>
#include <util/unittests/run_all.h>
+#include <gtest/gtest.h>
+
int
main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
-
+ isc::log::initLogger();
return (isc::util::unittests::run_all());
}
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// This is a workaround for strange linking problems with gtest:
// libdhcp___unittests-duid_unittest.o: In function `Compare<long unsigned int, long unsigned int>':
-// ~/gtest-1.6.0/include/gtest/gtest.h:1353: undefined reference to `isc::dhcp::ClientId::MAX_CLIENT_ID_LE'N
+// ~/gtest-1.6.0/include/gtest/gtest.h:1353: undefined reference to `isc::dhcp::ClientId::MAX_CLIENT_ID_LEN'
// collect2: ld returned 1 exit status
const size_t MAX_DUID_LEN = DUID::MAX_DUID_LEN;
}
// We'll connect to the loopback address so bind to it too.
local6.sin6_addr.s6_addr[15] = 1;
- if (bind(sock, (struct sockaddr *)&local6, sizeof(local6)) < 0) {
+ if (::bind(sock, (struct sockaddr *)&local6, sizeof(local6)) < 0) {
::close(sock);
isc_throw(Dhcp4o6IpcError, "Failed to bind DHCP4o6 socket.");
}
-// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
#include <cstdio> // for sscanf()
using std::string;
-using std::auto_ptr;
+using std::unique_ptr;
using std::vector;
using std::pair;
using boost::algorithm::iequals;
if (add_callback.empty()) {
isc_throw(isc::InvalidParameter, "Empty add RR callback");
}
- auto_ptr<MasterLoaderImpl> impl(new MasterLoaderImpl("", zone_origin,
- zone_class, callbacks,
- add_callback,
- options));
+ unique_ptr<MasterLoaderImpl> impl(new MasterLoaderImpl("", zone_origin,
+ zone_class,
+ callbacks,
+ add_callback,
+ options));
impl->pushStreamSource(stream);
impl_ = impl.release();
}
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Generic::Generic(const std::string& rdata_string) :
impl_(NULL)
{
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the GenericImpl that constructFromLexer() returns.
- std::auto_ptr<GenericImpl> impl_ptr(NULL);
+ std::unique_ptr<GenericImpl> impl_ptr;
try {
std::istringstream ss(rdata_string);
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
///
/// \param tsig_str A string containing the RDATA to be created
TSIG::TSIG(const std::string& tsig_str) : impl_(NULL) {
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the TSIGImpl that constructFromLexer() returns.
- std::auto_ptr<TSIGImpl> impl_ptr(NULL);
+ std::unique_ptr<TSIGImpl> impl_ptr;
try {
std::istringstream ss(tsig_str);
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
CAA::CAA(const string& caa_str) :
impl_(NULL)
{
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the CAAImpl that constructFromLexer() returns.
- std::auto_ptr<CAAImpl> impl_ptr(NULL);
+ std::unique_ptr<CAAImpl> impl_ptr;
try {
std::istringstream ss(caa_str);
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
DNSKEY::DNSKEY(const std::string& dnskey_str) :
impl_(NULL)
{
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the DNSKEYImpl that constructFromLexer() returns.
- std::auto_ptr<DNSKEYImpl> impl_ptr(NULL);
+ std::unique_ptr<DNSKEYImpl> impl_ptr;
try {
std::istringstream ss(dnskey_str);
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
NSEC3::NSEC3(const std::string& nsec3_str) :
impl_(NULL)
{
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the NSEC3Impl that constructFromLexer() returns.
- std::auto_ptr<NSEC3Impl> impl_ptr(NULL);
+ std::unique_ptr<NSEC3Impl> impl_ptr;
try {
std::istringstream ss(nsec3_str);
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
NSEC3PARAM::NSEC3PARAM(const std::string& nsec3param_str) :
impl_(NULL)
{
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the NSEC3PARAMImpl that constructFromLexer() returns.
- std::auto_ptr<NSEC3PARAMImpl> impl_ptr(NULL);
+ std::unique_ptr<NSEC3PARAMImpl> impl_ptr;
try {
std::istringstream ss(nsec3param_str);
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
OPT::OPT(InputBuffer& buffer, size_t rdata_len) :
impl_(NULL)
{
- std::auto_ptr<OPTImpl> impl_ptr(new OPTImpl);
+ std::unique_ptr<OPTImpl> impl_ptr(new OPTImpl);
while (true) {
if (rdata_len == 0) {
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
RRSIG::RRSIG(const std::string& rrsig_str) :
impl_(NULL)
{
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the RRSIGImpl that constructFromLexer() returns.
- std::auto_ptr<RRSIGImpl> impl_ptr(NULL);
+ std::unique_ptr<RRSIGImpl> impl_ptr;
try {
std::istringstream iss(rrsig_str);
-// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
SSHFP::SSHFP(const string& sshfp_str) :
impl_(NULL)
{
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the SSHFPImpl that constructFromLexer() returns.
- std::auto_ptr<SSHFPImpl> impl_ptr(NULL);
+ std::unique_ptr<SSHFPImpl> impl_ptr;
try {
std::istringstream ss(sshfp_str);
///////////////
///////////////
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
///
/// \param tsig_str A string containing the RDATA to be created
TSIG::TSIG(const std::string& tsig_str) : impl_(NULL) {
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the TSIGImpl that constructFromLexer() returns.
- std::auto_ptr<TSIGImpl> impl_ptr(NULL);
+ std::unique_ptr<TSIGImpl> impl_ptr;
try {
std::istringstream ss(tsig_str);
} // end of namespace "rdata"
} // end of namespace "dns"
} // end of namespace "isc"
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
CAA::CAA(const string& caa_str) :
impl_(NULL)
{
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the CAAImpl that constructFromLexer() returns.
- std::auto_ptr<CAAImpl> impl_ptr(NULL);
+ std::unique_ptr<CAAImpl> impl_ptr;
try {
std::istringstream ss(caa_str);
} // end of namespace "rdata"
} // end of namespace "dns"
} // end of namespace "isc"
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
DNSKEY::DNSKEY(const std::string& dnskey_str) :
impl_(NULL)
{
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the DNSKEYImpl that constructFromLexer() returns.
- std::auto_ptr<DNSKEYImpl> impl_ptr(NULL);
+ std::unique_ptr<DNSKEYImpl> impl_ptr;
try {
std::istringstream ss(dnskey_str);
} // end of namespace "rdata"
} // end of namespace "dns"
} // end of namespace "isc"
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
NSEC3::NSEC3(const std::string& nsec3_str) :
impl_(NULL)
{
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the NSEC3Impl that constructFromLexer() returns.
- std::auto_ptr<NSEC3Impl> impl_ptr(NULL);
+ std::unique_ptr<NSEC3Impl> impl_ptr;
try {
std::istringstream ss(nsec3_str);
} // end of namespace "rdata"
} // end of namespace "dns"
} // end of namespace "isc"
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
NSEC3PARAM::NSEC3PARAM(const std::string& nsec3param_str) :
impl_(NULL)
{
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the NSEC3PARAMImpl that constructFromLexer() returns.
- std::auto_ptr<NSEC3PARAMImpl> impl_ptr(NULL);
+ std::unique_ptr<NSEC3PARAMImpl> impl_ptr;
try {
std::istringstream ss(nsec3param_str);
} // end of namespace "rdata"
} // end of namespace "dns"
} // end of namespace "isc"
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
OPT::OPT(InputBuffer& buffer, size_t rdata_len) :
impl_(NULL)
{
- std::auto_ptr<OPTImpl> impl_ptr(new OPTImpl);
+ std::unique_ptr<OPTImpl> impl_ptr(new OPTImpl);
while (true) {
if (rdata_len == 0) {
} // end of namespace "rdata"
} // end of namespace "dns"
} // end of namespace "isc"
-// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
RRSIG::RRSIG(const std::string& rrsig_str) :
impl_(NULL)
{
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the RRSIGImpl that constructFromLexer() returns.
- std::auto_ptr<RRSIGImpl> impl_ptr(NULL);
+ std::unique_ptr<RRSIGImpl> impl_ptr;
try {
std::istringstream iss(rrsig_str);
} // end of namespace "rdata"
} // end of namespace "dns"
} // end of namespace "isc"
-// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
SSHFP::SSHFP(const string& sshfp_str) :
impl_(NULL)
{
- // We use auto_ptr here because if there is an exception in this
+ // We use unique_ptr here because if there is an exception in this
// constructor, the destructor is not called and there could be a
// leak of the SSHFPImpl that constructFromLexer() returns.
- std::auto_ptr<SSHFPImpl> impl_ptr(NULL);
+ std::unique_ptr<SSHFPImpl> impl_ptr;
try {
std::istringstream ss(sshfp_str);
-// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
#include <util/memory_segment_local.h>
#include <exceptions/exceptions.h>
#include <gtest/gtest.h>
+#include <boost/scoped_ptr.hpp>
#include <memory>
#include <limits.h>
namespace {
TEST(MemorySegmentLocal, TestLocal) {
- auto_ptr<MemorySegment> segment(new MemorySegmentLocal());
+ boost::scoped_ptr<MemorySegment> segment(new MemorySegmentLocal());
// By default, nothing is allocated.
EXPECT_TRUE(segment->allMemoryDeallocated());
/// @todo: disabled, see ticket #3510
TEST(MemorySegmentLocal, DISABLED_TestTooMuchMemory) {
- auto_ptr<MemorySegment> segment(new MemorySegmentLocal());
+ boost::scoped_ptr<MemorySegment> segment(new MemorySegmentLocal());
// Although it should be perfectly fine to use the ULONG_MAX
// instead of LONG_MAX as the size_t value should be unsigned,
}
TEST(MemorySegmentLocal, TestBadDeallocate) {
- auto_ptr<MemorySegment> segment(new MemorySegmentLocal());
+ boost::scoped_ptr<MemorySegment> segment(new MemorySegmentLocal());
// By default, nothing is allocated.
EXPECT_TRUE(segment->allMemoryDeallocated());
}
TEST(MemorySegmentLocal, TestNullDeallocate) {
- auto_ptr<MemorySegment> segment(new MemorySegmentLocal());
+ boost::scoped_ptr<MemorySegment> segment(new MemorySegmentLocal());
// By default, nothing is allocated.
EXPECT_TRUE(segment->allMemoryDeallocated());
-// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
#include <pthread.h>
-using std::auto_ptr;
+using std::unique_ptr;
namespace isc {
namespace util {
isc_throw(isc::InvalidOperation, std::strerror(result));
}
- auto_ptr<Impl> impl(new Impl);
+ unique_ptr<Impl> impl(new Impl);
result = pthread_mutex_init(&impl->mutex, &attributes);
switch (result) {
case 0: // All 0K
-// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
/// is destroyed.
///
/// If you create the locker on the stack or using some other "garbage
- /// collecting" mechanism (auto_ptr, for example), it ensures exception
+ /// collecting" mechanism (unique_ptr, for example), it ensures exception
/// safety with regards to the mutex - it'll get released on the exit
/// of function no matter by what means.
class Locker : boost::noncopyable {
using std::string;
using std::exception;
-using std::auto_ptr;
+using std::unique_ptr;
using boost::scoped_ptr;
namespace isc {
Thread::Thread(const boost::function<void ()>& main) :
impl_(NULL)
{
- auto_ptr<Impl> impl(new Impl(main));
+ unique_ptr<Impl> impl(new Impl(main));
Blocker blocker;
const int result = pthread_create(&impl->tid_, NULL, &Impl::run,
impl.get());
projects / thirdparty / kea.git / commitdiff
