security: change enum to enum class in security-common.hpp

Change-Id: I5565c845cd57f3457c8120b11399a105fa83418d
Refs: #3083
diff --git a/src/security/security-common.hpp b/src/security/security-common.hpp
index 8edb22c..15a82bf 100644
--- a/src/security/security-common.hpp
+++ b/src/security/security-common.hpp
@@ -37,40 +37,51 @@
 
 } // namespace signed_interest
 
-enum KeyType {
-  KEY_TYPE_NONE  = 0,
-  /// @deprecated use KEY_TYPE_NONE
-  KEY_TYPE_NULL = KEY_TYPE_NONE,
-
-  KEY_TYPE_RSA   = 1,
-  KEY_TYPE_ECDSA = 2,
-  KEY_TYPE_AES   = 128
+enum class KeyType {
+  NONE = 0,
+  RSA  = 1,
+  EC   = 2,
+  AES  = 128
 };
 
-enum KeyClass {
-  KEY_CLASS_NONE,
-  KEY_CLASS_PUBLIC,
-  KEY_CLASS_PRIVATE,
-  KEY_CLASS_SYMMETRIC
+std::ostream&
+operator<<(std::ostream& os, KeyType keyType);
+
+enum class KeyClass {
+  NONE,
+  PUBLIC,
+  PRIVATE,
+  SYMMETRIC
 };
 
-enum DigestAlgorithm {
-  DIGEST_ALGORITHM_NONE = 0,
-  DIGEST_ALGORITHM_SHA256 = 1
+std::ostream&
+operator<<(std::ostream& os, KeyClass keyClass);
+
+enum class DigestAlgorithm {
+  NONE   = 0,
+  SHA256 = 1
 };
 
-enum EncryptMode {
-  ENCRYPT_MODE_DEFAULT,
-  ENCRYPT_MODE_CFB_AES
-  // ENCRYPT_MODE_CBC_AES
+std::ostream&
+operator<<(std::ostream& os, DigestAlgorithm algorithm);
+
+enum class BlockCipherAlgorithm {
+  NONE,
+  AES_CBC
 };
 
-enum AclType {
-  ACL_TYPE_NONE,
-  ACL_TYPE_PUBLIC,
-  ACL_TYPE_PRIVATE
+std::ostream&
+operator<<(std::ostream& os, BlockCipherAlgorithm algorithm);
+
+enum class AclType {
+  NONE,
+  PUBLIC,
+  PRIVATE
 };
 
+std::ostream&
+operator<<(std::ostream& os, AclType aclType);
+
 } // namespace ndn
 
 #endif // NDN_SECURITY_COMMON_HPP