security: consistently use EVP_MD conversion helper
Change-Id: Icd95009fba223c461988fe7b341be55972d30f91
diff --git a/src/security/security-common.hpp b/src/security/security-common.hpp
index 20d8040..2a0a4c8 100644
--- a/src/security/security-common.hpp
+++ b/src/security/security-common.hpp
@@ -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).
@@ -24,8 +24,6 @@
#include "../common.hpp"
-#define NDN_CXX_KEEP_SECURITY_V1_ALIASES
-
namespace ndn {
namespace signed_interest {
@@ -75,17 +73,20 @@
*
* This KeyId provides roughly uniqueness of the key names.
*/
- RANDOM = 2
+ RANDOM = 2,
};
std::ostream&
operator<<(std::ostream& os, KeyIdType keyIdType);
+/**
+ * @brief The type of a cryptographic key
+ */
enum class KeyType {
- NONE = 0,
- RSA = 1,
- EC = 2,
- AES = 128
+ NONE = 0, ///< Unknown key type
+ RSA = 1, ///< RSA key, supports sign/verify and encrypt/decrypt operations
+ EC = 2, ///< Elliptic Curve key (e.g. for ECDSA), supports sign/verify operations
+ AES = 128, ///< AES key, supports encrypt/decrypt operations
};
std::ostream&
@@ -95,7 +96,7 @@
NONE,
PUBLIC,
PRIVATE,
- SYMMETRIC
+ SYMMETRIC,
};
std::ostream&
@@ -103,7 +104,7 @@
enum class DigestAlgorithm {
NONE = 0,
- SHA256 = 1
+ SHA256 = 1,
};
std::ostream&
@@ -111,7 +112,7 @@
enum class BlockCipherAlgorithm {
NONE,
- AES_CBC
+ AES_CBC,
};
std::ostream&
@@ -119,7 +120,7 @@
enum class CipherOperator {
DECRYPT = 0,
- ENCRYPT = 1
+ ENCRYPT = 1,
};
std::ostream&
@@ -128,7 +129,7 @@
enum class AclType {
NONE,
PUBLIC,
- PRIVATE
+ PRIVATE,
};
std::ostream&