commit def60f1647d3aba0e3406dc0746063084c4da172
author Davide Pesavento <davide.pesavento@lip6.fr> Sun Sep 17 17:26:07 2017 -0400
committer Davide Pesavento <davide.pesavento@lip6.fr> Mon Sep 18 19:06:29 2017 -0400
tree b6c78000b2a231ee528ad550d337dabb5171e51a
parent 3504cc4405b0b191cfb14069c5597c2d35a48517

security: support more SHA2 hash functions

Change-Id: Ibbe4f02054ae9028899e8408c331ae8e704df9b8

src/security/security-common.cpp

diff --git a/src/security/security-common.cpp b/src/security/security-common.cpp
index cda5fc5..5cfe551 100644
--- a/src/security/security-common.cpp
+++ b/src/security/security-common.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,6 +20,7 @@
  */
 
 #include "security-common.hpp"
+
 #include <ostream>
 
 namespace ndn {
@@ -50,7 +51,7 @@
       return os << "EC";
     case KeyType::AES:
       return os << "AES";
-  };
+  }
   return os << static_cast<int>(keyType);
 }
 
@@ -66,7 +67,7 @@
       return os << "PRIVATE";
     case KeyClass::SYMMETRIC:
       return os << "SYMMETRIC";
-  };
+  }
   return os << static_cast<int>(keyClass);
 }
 
@@ -76,9 +77,15 @@
   switch (algorithm) {
     case DigestAlgorithm::NONE:
       return os << "NONE";
+    case DigestAlgorithm::SHA224:
+      return os << "SHA224";
     case DigestAlgorithm::SHA256:
       return os << "SHA256";
-  };
+    case DigestAlgorithm::SHA384:
+      return os << "SHA384";
+    case DigestAlgorithm::SHA512:
+      return os << "SHA512";
+  }
   return os << static_cast<int>(algorithm);
 }
 
@@ -90,7 +97,7 @@
       return os << "NONE";
     case BlockCipherAlgorithm::AES_CBC:
       return os << "AES_CBC";
-  };
+  }
   return os << static_cast<int>(algorithm);
 }
 
@@ -102,7 +109,7 @@
       return os << "DECRYPT";
     case CipherOperator::ENCRYPT:
       return os << "ENCRYPT";
-  };
+  }
   return os << static_cast<int>(op);
 }
 
@@ -116,7 +123,7 @@
       return os << "PUBLIC";
     case AclType::PRIVATE:
       return os << "PRIVATE";
-  };
+  }
   return os << static_cast<int>(aclType);
 }