From: Francis Dupont <fdupont@isc.org>
Date: Fri, 10 Feb 2017 17:54:07 +0000 (+0100)
Subject: [master] Finished merge of trac4633 (update cryptolink)
X-Git-Tag: trac3590_base~4^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43281bd9de2184d356317caaebc91575720c5d94;p=thirdparty%2Fkea.git

[master] Finished merge of trac4633 (update cryptolink)
---

43281bd9de2184d356317caaebc91575720c5d94
diff --cc src/lib/cryptolink/crypto_hash.h
index e5d94ed70b,eeafd17810..f5ea3fade5
--- a/src/lib/cryptolink/crypto_hash.h
+++ b/src/lib/cryptolink/crypto_hash.h
@@@ -1,4 -1,4 +1,4 @@@
--// Copyright (C) 2014-2016 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
diff --cc src/lib/cryptolink/crypto_hmac.h
index 709971ae2e,dcfdee996a..5c7bffee61
--- a/src/lib/cryptolink/crypto_hmac.h
+++ b/src/lib/cryptolink/crypto_hmac.h
@@@ -1,4 -1,4 +1,4 @@@
--// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC")
++// Copyright (C) 2011-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