diff options
| author | Andrei Pavel <andrei.pavel@qualitance.com> | 2017-08-17 20:04:29 +0200 |
|---|---|---|
| committer | Andrei Pavel <andrei.pavel@qualitance.com> | 2017-08-17 20:04:29 +0200 |
| commit | 529d15326887b3513413567e497118b3db2c24f3 (patch) | |
| tree | 8b66b262349433802bd52e920bb4783baac57cb3 /src/lib/cryptolink/botan_common.h | |
| parent | Added mysql_execute_script (diff) | |
| parent | [master] Added ChangeLog 1288 for trac 5315. (diff) | |
| download | kea-529d15326887b3513413567e497118b3db2c24f3.tar.xz kea-529d15326887b3513413567e497118b3db2c24f3.zip | |
Merge branch 'isc-master' into minor-changes
Diffstat (limited to 'src/lib/cryptolink/botan_common.h')
| -rw-r--r-- | src/lib/cryptolink/botan_common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/cryptolink/botan_common.h b/src/lib/cryptolink/botan_common.h index 96ef1cd508..05cae30fbb 100644 --- a/src/lib/cryptolink/botan_common.h +++ b/src/lib/cryptolink/botan_common.h @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2014-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 @@ -12,7 +12,7 @@ namespace btn { /// /// @param algorithm algorithm to be converted /// @return static text representation of the algorithm name -const char* +const std::string getHashAlgorithmName(isc::cryptolink::HashAlgorithm algorithm); } // namespace btn |