From: Francis Dupont <fdupont@isc.org>
Date: Fri, 10 Feb 2017 18:05:47 +0000 (+0100)
Subject: [master] Fixed merging error
X-Git-Tag: trac3590_base~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8777a1ddd03e3834022731595a342c8198747263;p=thirdparty%2Fkea.git

[master] Fixed merging error
---

diff --git a/src/lib/cryptolink/botan_hmac.cc b/src/lib/cryptolink/botan_hmac.cc
index c448c493bc..6c34527a3b 100644
--- a/src/lib/cryptolink/botan_hmac.cc
+++ b/src/lib/cryptolink/botan_hmac.cc
@@ -196,7 +196,7 @@ public:
             if (len > size) {
                 len = size;
             }
-            if (digest_.empty()) {
+            if (digest_.size() == 0) {
                 digest_ = hmac_->final();
             }
             return (Botan::same_mem(&digest_[0],