Remove all namespaces from ckm-error.h header.

[platform/core/security/key-manager.git] / src / include / ckm / ckm-type.h

diff --git a/src/include/ckm/ckm-type.h b/src/include/ckm/ckm-type.h
index 938973e..a054918 100644 (file)
--- a/src/include/ckm/ckm-type.h
+++ b/src/include/ckm/ckm-type.h
@@ -28,6 +28,7 @@ namespace CKM {
 
 // used to pass password and raw key data
 typedef std::vector<unsigned char> RawBuffer;
+typedef std::vector<RawBuffer> RawBufferVector;
 typedef std::string Alias;
 typedef std::vector<Alias> AliasVector;
 
@@ -35,9 +36,21 @@ enum class KeyType : int {
     KEY_NONE,
     KEY_RSA_PUBLIC,
     KEY_RSA_PRIVATE,
-    //        KEY_ECDSA_PUBLIC,
-    //        KEY_ECDSA_PRIVATE,
-    //        KEY_AES
+    KEY_ECDSA_PUBLIC,
+    KEY_ECDSA_PRIVATE,
+    KEY_AES
+};
+
+enum class DataFormat : int {
+    FORM_DER_BASE64,
+    FORM_DER,
+    FORM_PEM
+};
+
+enum class ElipticCurve : int {
+    prime192v1,
+    prime256v1,
+    secp384r1
 };
 
 struct Policy {
@@ -62,16 +75,24 @@ enum class HashAlgorithm : int {
 
 // Added by Dongsun Lee
 enum class RSAPaddingAlgorithm : int {
-    XRSA_PKCS1_PADDING,
-    XRSA_SSLV23_PADDING,
-    XRSA_NO_PADDING,
-    XRSA_PKCS1_OAEP_PADDING,
-    XRSA_X931_PADDING
+    PKCS1,
+//  SSLV23, // not supported
+//  NONE, // not supported
+//  PKCS1_OAEP, // not supported
+    X931
+};
+
+enum class DBCMAlgType : int {
+    NONE,
+    AES_CBC_256,
+    COUNT
 };
 
 // Internal types
-class KeyImpl;
+class GenericKey;
 class CertificateImpl;
 
+const char * ErrorToString(int error);
+
 } // namespace CKM