diff options
| author | Andrei Pavel <andrei.pavel@qualitance.com> | 2017-08-17 19:54:15 +0200 |
|---|---|---|
| committer | Andrei Pavel <andrei.pavel@qualitance.com> | 2017-08-17 19:54:15 +0200 |
| commit | a8f6403d1b44f62ebb3dd3085e401b46767003a0 (patch) | |
| tree | 00df52bd413b27ed04097164021251f8e8ec6c80 /src/lib/cryptolink/botan_link.cc | |
| parent | Removed duplicate include (diff) | |
| parent | [master] Added ChangeLog 1288 for trac 5315. (diff) | |
| download | kea-a8f6403d1b44f62ebb3dd3085e401b46767003a0.tar.xz kea-a8f6403d1b44f62ebb3dd3085e401b46767003a0.zip | |
Merge branch 'isc-master' into config-h
Diffstat (limited to 'src/lib/cryptolink/botan_link.cc')
| -rw-r--r-- | src/lib/cryptolink/botan_link.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/cryptolink/botan_link.cc b/src/lib/cryptolink/botan_link.cc index c6ca682d21..f57cb45dd3 100644 --- a/src/lib/cryptolink/botan_link.cc +++ b/src/lib/cryptolink/botan_link.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2011-2015,2017 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 @@ -10,7 +10,10 @@ #include <cryptolink/crypto_hash.h> #include <cryptolink/crypto_hmac.h> +#define BOTAN_NO_DEPRECATED_WARNINGS + #include <botan/botan.h> +#include <botan/init.h> namespace isc { namespace cryptolink { @@ -32,7 +35,7 @@ CryptoLink::initialize() { try { c.impl_ = new CryptoLinkImpl(); } catch (const Botan::Exception& ex) { - isc_throw(InitializationError, ex.what()); + isc_throw(InitializationError, "Botan error: " << ex.what()); } } } |