[UTC][yaca][Non-ACR][Fix build break]

Change-Id: I8bea02dc40a938e411b50ca3aac74a4130964ebc
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

diff --git a/src/utc/yaca/utc-yaca-encrypt.c b/src/utc/yaca/utc-yaca-encrypt.c
index 6210f383ff7b538fc14e494f75ef3abebef77497..4c3a43604ce76266589760531e86a526f21dfca9 100644 (file)
--- a/src/utc/yaca/utc-yaca-encrypt.c
+++ b/src/utc/yaca/utc-yaca-encrypt.c
@@ -19,6 +19,7 @@
 #include <yaca_encrypt.h>
 #include <yaca_crypto.h>
 #include <yaca_key.h>
+#include <yaca_simple.h>
 
 #include "lorem.h"
 
@@ -727,7 +728,7 @@ int utc_yaca_decrypt_update_n(void)
        return 0;
 }
 
-void encrypt_advanced(const yaca_encrypt_algorithm_e algo,
+int encrypt_advanced(const yaca_encrypt_algorithm_e algo,
                                                const yaca_block_cipher_mode_e bcm,
                                                const yaca_key_type_e key_type,
                                                const size_t key_bit_len)
@@ -807,6 +808,8 @@ void encrypt_advanced(const yaca_encrypt_algorithm_e algo,
        yaca_context_destroy(ctx);
        yaca_key_destroy(iv);
        yaca_key_destroy(key);
+
+       return 0;
 }
 
 
@@ -823,35 +826,35 @@ int utc_yaca_decrypt_finalize_p(void)
        yaca_key_type_e key_type = YACA_KEY_TYPE_SYMMETRIC;
        size_t key_bit_len = YACA_KEY_LENGTH_256BIT;
 
-       encrypt_advanced(algo, bcm, key_type, key_bit_len);
+       assert_eq(encrypt_advanced(algo, bcm, key_type, key_bit_len), 0);
 
        algo = YACA_ENCRYPT_3DES_3TDEA;
        bcm = YACA_BCM_OFB;
        key_type = YACA_KEY_TYPE_DES;
        key_bit_len = YACA_KEY_LENGTH_192BIT;
 
-       encrypt_advanced(algo, bcm, key_type, key_bit_len);
+       assert_eq(encrypt_advanced(algo, bcm, key_type, key_bit_len), 0);
 
        algo = YACA_ENCRYPT_CAST5;
        bcm = YACA_BCM_CFB;
        key_type = YACA_KEY_TYPE_SYMMETRIC;
        key_bit_len = YACA_KEY_LENGTH_UNSAFE_40BIT;
 
-       encrypt_advanced(algo, bcm, key_type, key_bit_len);
+       assert_eq(encrypt_advanced(algo, bcm, key_type, key_bit_len), 0);
 
        algo = YACA_ENCRYPT_UNSAFE_RC2;
        bcm = YACA_BCM_CBC;
        key_type = YACA_KEY_TYPE_SYMMETRIC;
        key_bit_len = YACA_KEY_LENGTH_UNSAFE_8BIT;
 
-       encrypt_advanced(algo, bcm, key_type, key_bit_len);
+       assert_eq(encrypt_advanced(algo, bcm, key_type, key_bit_len), 0);
 
        algo = YACA_ENCRYPT_UNSAFE_RC4;
        bcm = YACA_BCM_NONE;
        key_type = YACA_KEY_TYPE_SYMMETRIC;
        key_bit_len = YACA_KEY_LENGTH_2048BIT;
 
-       encrypt_advanced(algo, bcm, key_type, key_bit_len);
+       assert_eq(encrypt_advanced(algo, bcm, key_type, key_bit_len), 0);
 
        return 0;
 }

diff --git a/src/utc/yaca/utc-yaca-key.c b/src/utc/yaca/utc-yaca-key.c
index e51a461d771e5c30bf2abf9fcab18d618543cf7a..7c0bda141ff7f2bacb4c491524b7cd4393e18a1a 100644 (file)
--- a/src/utc/yaca/utc-yaca-key.c
+++ b/src/utc/yaca/utc-yaca-key.c
@@ -243,7 +243,7 @@ int utc_yaca_key_import_p2(void)
        return 0;
 }
 
-void export_import_asymmetric_keys(yaca_key_type_e pri_key_type, yaca_key_type_e pub_key_type, size_t key_bit_len)
+int export_import_asymmetric_keys(yaca_key_type_e pri_key_type, yaca_key_type_e pub_key_type, size_t key_bit_len)
 {
        yaca_key_h pri_key = YACA_KEY_NULL;
        yaca_key_h pub_key = YACA_KEY_NULL;
@@ -293,6 +293,8 @@ void export_import_asymmetric_keys(yaca_key_type_e pri_key_type, yaca_key_type_e
        yaca_free(der);
        yaca_free(pem);
        yaca_free(pkcs8);
+
+       return 0;
 }
 
 
@@ -304,8 +306,7 @@ void export_import_asymmetric_keys(yaca_key_type_e pri_key_type, yaca_key_type_e
  */
 int utc_yaca_key_import_p3(void)
 {
-       export_import_asymmetric_keys(YACA_KEY_TYPE_RSA_PRIV, YACA_KEY_TYPE_RSA_PUB, YACA_KEY_LENGTH_1024BIT);
-       return 0;
+       return export_import_asymmetric_keys(YACA_KEY_TYPE_RSA_PRIV, YACA_KEY_TYPE_RSA_PUB, YACA_KEY_LENGTH_1024BIT);
 }
 
 /*
@@ -316,8 +317,7 @@ int utc_yaca_key_import_p3(void)
  */
 int utc_yaca_key_import_p4(void)
 {
-       export_import_asymmetric_keys(YACA_KEY_TYPE_DSA_PRIV, YACA_KEY_TYPE_DSA_PUB, YACA_KEY_LENGTH_1024BIT);
-       return 0;
+       return export_import_asymmetric_keys(YACA_KEY_TYPE_DSA_PRIV, YACA_KEY_TYPE_DSA_PUB, YACA_KEY_LENGTH_1024BIT);
 }
 
 /*
@@ -328,8 +328,7 @@ int utc_yaca_key_import_p4(void)
  */
 int utc_yaca_key_import_p5(void)
 {
-       export_import_asymmetric_keys(YACA_KEY_TYPE_EC_PRIV, YACA_KEY_TYPE_EC_PUB, YACA_KEY_LENGTH_EC_SECP384R1);
-       return 0;
+       return export_import_asymmetric_keys(YACA_KEY_TYPE_EC_PRIV, YACA_KEY_TYPE_EC_PUB, YACA_KEY_LENGTH_EC_SECP384R1);
 }
 
 /*
@@ -340,11 +339,10 @@ int utc_yaca_key_import_p5(void)
  */
 int utc_yaca_key_import_p6(void)
 {
-       export_import_asymmetric_keys(YACA_KEY_TYPE_DH_PRIV, YACA_KEY_TYPE_DH_PUB, YACA_KEY_LENGTH_DH_RFC_2048_224);
-       return 0;
+       return export_import_asymmetric_keys(YACA_KEY_TYPE_DH_PRIV, YACA_KEY_TYPE_DH_PUB, YACA_KEY_LENGTH_DH_RFC_2048_224);
 }
 
-void export_import_asymmetric_params(yaca_key_type_e param_key_type, size_t key_bit_len)
+int export_import_asymmetric_params(yaca_key_type_e param_key_type, size_t key_bit_len)
 {
        yaca_key_h param_key = YACA_KEY_NULL;
        int ret = YACA_ERROR_NONE;
@@ -377,6 +375,8 @@ void export_import_asymmetric_params(yaca_key_type_e param_key_type, size_t key_
        yaca_key_destroy(der_imported);
        yaca_free(der);
        yaca_free(pem);
+
+       return 0;
 }
 
 /*
@@ -387,8 +387,7 @@ void export_import_asymmetric_params(yaca_key_type_e param_key_type, size_t key_
  */
 int utc_yaca_key_import_p7(void)
 {
-       export_import_asymmetric_params(YACA_KEY_TYPE_DSA_PARAMS, YACA_KEY_LENGTH_512BIT);
-       return 0;
+       return export_import_asymmetric_params(YACA_KEY_TYPE_DSA_PARAMS, YACA_KEY_LENGTH_512BIT);
 }
 
 /*
@@ -399,8 +398,7 @@ int utc_yaca_key_import_p7(void)
  */
 int utc_yaca_key_import_p8(void)
 {
-       export_import_asymmetric_params(YACA_KEY_TYPE_DH_PARAMS, YACA_KEY_LENGTH_DH_RFC_2048_256);
-       return 0;
+       return export_import_asymmetric_params(YACA_KEY_TYPE_DH_PARAMS, YACA_KEY_LENGTH_DH_RFC_2048_256);
 }
 
 /*
@@ -411,8 +409,7 @@ int utc_yaca_key_import_p8(void)
  */
 int utc_yaca_key_import_p9(void)
 {
-       export_import_asymmetric_params(YACA_KEY_TYPE_EC_PARAMS, YACA_KEY_LENGTH_EC_PRIME256V1);
-       return 0;
+       return export_import_asymmetric_params(YACA_KEY_TYPE_EC_PARAMS, YACA_KEY_LENGTH_EC_PRIME256V1);
 }