Rename RSAPadddingAlgorithms values.

Old values does not have any sense because there is no such algorithm
as XRSA.

Change-Id: I9e10dc4507f910ba8d37d2cb8746c2b0196af1b4

diff --git a/src/include/ckm/ckm-type.h b/src/include/ckm/ckm-type.h
index eec6302..a5e4fb9 100644 (file)
--- a/src/include/ckm/ckm-type.h
+++ b/src/include/ckm/ckm-type.h
@@ -75,11 +75,11 @@ enum class HashAlgorithm : int {
 
 // Added by Dongsun Lee
 enum class RSAPaddingAlgorithm : int {
-    XRSA_PKCS1_PADDING,
-//  XRSA_SSLV23_PADDING, // not supported
-//  XRSA_NO_PADDING, // not supported
-//  XRSA_PKCS1_OAEP_PADDING, // not supported
-    XRSA_X931_PADDING
+    PKCS1,
+//  SSLV23, // not supported
+//  NONE, // not supported
+//  PKCS1_OAEP, // not supported
+    X931
 };
 
 enum class DBCMAlgType : int {

diff --git a/src/manager/service/CryptoService.cpp b/src/manager/service/CryptoService.cpp
index a3b5b54..39908a3 100644 (file)
--- a/src/manager/service/CryptoService.cpp
+++ b/src/manager/service/CryptoService.cpp
@@ -321,10 +321,10 @@ int CryptoService::createSignature(const GenericKey &privateKey,
 
        if(privateKey.getType()==KeyType::KEY_RSA_PRIVATE) {
                switch(padAlgo) {
-               case RSAPaddingAlgorithm::XRSA_PKCS1_PADDING:
+               case RSAPaddingAlgorithm::PKCS1:
                        rsa_padding = RSA_PKCS1_PADDING;
                        break;
-               case RSAPaddingAlgorithm::XRSA_X931_PADDING:
+               case RSAPaddingAlgorithm::X931:
                        rsa_padding = RSA_X931_PADDING;
                        break;
                default:
@@ -454,10 +454,10 @@ int CryptoService::verifySignature(const GenericKey &publicKey,
 
        if(publicKey.getType()==KeyType::KEY_RSA_PUBLIC) {
                switch(padAlgo) {
-               case RSAPaddingAlgorithm::XRSA_PKCS1_PADDING:
+               case RSAPaddingAlgorithm::PKCS1:
                        rsa_padding = RSA_PKCS1_PADDING;
                        break;
-               case RSAPaddingAlgorithm::XRSA_X931_PADDING:
+               case RSAPaddingAlgorithm::X931:
                        rsa_padding = RSA_X931_PADDING;
                        break;
                default: