[master] Finished merge of trac4633 (update cryptolink)

diff --cc configure.ac
Simple merge

diff --cc src/lib/cryptolink/botan_hmac.cc
Simple merge

diff --cc src/lib/cryptolink/crypto_hash.h
index e5d94ed70bd2292925c875e6f083738f9824b79a,eeafd17810401821e7e5cfa200ad7c55621453fe..f5ea3fade5db287cb49efeeef2d6d4c27878f0fb
--- 1/src/lib/cryptolink/crypto_hash.h
--- 2/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 709971ae2e1b0f1ef268dfe73706488e9824ec80,dcfdee996ad9f2fd53fbc3986c4daf7377bdf696..5c7bffee61ecaeca680df78c3c1181bf6b147ea8
--- 1/src/lib/cryptolink/crypto_hmac.h
--- 2/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