commit 10b24be850b4c62acd11d09059c08b93b8b97c2c
author Davide Pesavento <davide.pesavento@lip6.fr> Wed Jul 12 23:23:46 2017 -0400
committer Davide Pesavento <davide.pesavento@lip6.fr> Fri Jul 14 11:16:32 2017 -0400
tree 92199f3e22766f51a733523ca280bb11bbacc011
parent 770f904735b1753d6ba4f8f465d3332c8d5fadda

util: deprecate crypto::computeSha256Digest()

Use Sha256::computeDigest() instead.

Change-Id: I9db5b4839559c9c7930cdc24c78f35ca76b25b52

src/security/validator.cpp

diff --git a/src/security/validator.cpp b/src/security/validator.cpp
index f0f87b7..4862d76 100644
--- a/src/security/validator.cpp
+++ b/src/security/validator.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
@@ -20,7 +20,7 @@
  */
 
 #include "validator.hpp"
-#include "../util/crypto.hpp"
+#include "../util/digest.hpp"
 #include "../lp/tags.hpp"
 
 #include "v1/cryptopp.hpp"
@@ -234,21 +234,20 @@
 Validator::verifySignature(const uint8_t* buf, const size_t size, const DigestSha256& sig)
 {
   try {
-    ConstBufferPtr buffer = crypto::computeSha256Digest(buf, size);
+    ConstBufferPtr buffer = util::Sha256::computeDigest(buf, size);
     const Block& sigValue = sig.getValue();
 
-    if (buffer != nullptr &&
-        buffer->size() == sigValue.value_size() &&
-        buffer->size() == crypto::SHA256_DIGEST_SIZE) {
+    if (buffer->size() == sigValue.value_size() &&
+        buffer->size() == util::Sha256::DIGEST_SIZE) {
       const uint8_t* p1 = buffer->buf();
       const uint8_t* p2 = sigValue.value();
 
-      return 0 == memcmp(p1, p2, crypto::SHA256_DIGEST_SIZE);
+      return 0 == memcmp(p1, p2, util::Sha256::DIGEST_SIZE);
     }
     else
       return false;
   }
-  catch (const CryptoPP::Exception& e) {
+  catch (const util::Sha256::Error&) {
     return false;
   }
 }