commit 87039537fc33ffe726077e50a531bc30b5874b80
author Davide Pesavento <davide.pesavento@lip6.fr> Sat Sep 16 15:15:39 2017 -0400
committer Davide Pesavento <davide.pesavento@lip6.fr> Mon Sep 18 18:50:08 2017 -0400
tree a87ea82eea160726da5f2b6877a74e0492e84845
parent c21979d3ba95235893bd400084c52a8098a63eba

security: consistently use EVP_MD conversion helper

Change-Id: Icd95009fba223c461988fe7b341be55972d30f91

src/security/transform/signer-filter.cpp

diff --git a/src/security/transform/signer-filter.cpp b/src/security/transform/signer-filter.cpp
index 16d3146..ab9fdb3 100644
--- a/src/security/transform/signer-filter.cpp
+++ b/src/security/transform/signer-filter.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * 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,8 +20,9 @@
  */
 
 #include "signer-filter.hpp"
-#include "../../encoding/buffer.hpp"
-#include "../detail/openssl.hpp"
+#include "../detail/openssl-helper.hpp"
+
+#include <boost/lexical_cast.hpp>
 
 namespace ndn {
 namespace security {
@@ -53,16 +54,14 @@
 SignerFilter::SignerFilter(DigestAlgorithm algo, const PrivateKey& key)
   : m_impl(new Impl(key))
 {
-  switch (algo) {
-    case DigestAlgorithm::SHA256: {
-      if (!BIO_set_md(m_impl->m_md, EVP_sha256()))
-        BOOST_THROW_EXCEPTION(Error(getIndex(), "Cannot set digest"));
-      break;
-    }
+  const EVP_MD* md = detail::digestAlgorithmToEvpMd(algo);
+  if (md == nullptr)
+    BOOST_THROW_EXCEPTION(Error(getIndex(), "Unsupported digest algorithm " +
+                                boost::lexical_cast<std::string>(algo)));
 
-    default:
-      BOOST_THROW_EXCEPTION(Error(getIndex(), "Digest algorithm is not supported"));
-  }
+  if (!BIO_set_md(m_impl->m_md, md))
+    BOOST_THROW_EXCEPTION(Error(getIndex(), "Cannot set digest " +
+                                boost::lexical_cast<std::string>(algo)));
 }
 
 size_t