Fix compilation with Clang.

Some bugs in the code fixed, caught by Clang warnings/errors.

Change-Id: If6b2b617222ea8d07d5d3af4202a4dae3b7ebebe
Signed-off-by: Lukasz Pawelczyk <l.pawelczyk@samsung.com>

diff --git a/examples/encrypt.c b/examples/encrypt.c
index 26f21e8..8ca1bc1 100644 (file)
--- a/examples/encrypt.c
+++ b/examples/encrypt.c
@@ -100,7 +100,7 @@ void encrypt_advanced(void)
        if (ret)
                return;
 
-       ret = yaca_key_gen(&iv, YACA_KEY_IV_256BIT, YACA_KEY_TYPE_SYMMETRIC);
+       ret = yaca_key_gen(&iv, YACA_KEY_TYPE_SYMMETRIC, YACA_KEY_IV_256BIT);
        if (ret)
                goto ex_key;
 
@@ -208,7 +208,8 @@ void encrypt_seal(void)
 
        /// Generate key pair
        ret = yaca_key_gen_pair(&key_priv, &key_pub,
-                               YACA_KEY_2048BIT, YACA_KEY_TYPE_PAIR_RSA);
+                               YACA_KEY_TYPE_PAIR_RSA,
+                               YACA_KEY_2048BIT);
        if (ret) return;
 
        /// Encrypt a.k.a. seal

diff --git a/examples/encrypt_aes_gcm.c b/examples/encrypt_aes_gcm.c
index bd65c0d..3976170 100644 (file)
--- a/examples/encrypt_aes_gcm.c
+++ b/examples/encrypt_aes_gcm.c
@@ -36,7 +36,7 @@ void encrypt_decrypt_aes_gcm(void)
 {
        int ret;
 
-       yaca_ctx_h ctx;
+       yaca_ctx_h ctx = YACA_CTX_NULL;
 
        yaca_key_h key = YACA_KEY_NULL;
        yaca_key_h iv = YACA_KEY_NULL;
@@ -55,17 +55,17 @@ void encrypt_decrypt_aes_gcm(void)
 
        /// Key generation
 
-       ret = yaca_key_gen(&key, YACA_KEY_256BIT, YACA_KEY_TYPE_SYMMETRIC); // key_type, key_len, *key ? looks imo much better
+       ret = yaca_key_gen(&key, YACA_KEY_TYPE_SYMMETRIC, YACA_KEY_256BIT); // key_type, key_len, *key ? looks imo much better
        if (ret < 0)
                goto clean;
 
        // use YACA_KEY_IV_128BIT & YACA_KEY_TYPE_IV or maybe YACA_KEY_128BIT & YACA_KEY_TYPE_SYMMETRIC ?
-       ret = yaca_key_gen(&iv, YACA_KEY_IV_128BIT, YACA_KEY_TYPE_IV);
+       ret = yaca_key_gen(&iv, YACA_KEY_TYPE_IV, YACA_KEY_IV_128BIT);
        if (ret < 0)
                goto clean;
 
        // use YACA_KEY_128BIT & YACA_KEY_TYPE_SYMMETRIC or maybe add YACA_KEY_AAD_128BIT & YACA_KEY_TYPE_AAD ?
-       ret = yaca_key_gen(&aad_key, YACA_KEY_UNSAFE_128BIT, YACA_KEY_TYPE_SYMMETRIC);
+       ret = yaca_key_gen(&aad_key, YACA_KEY_TYPE_SYMMETRIC, YACA_KEY_UNSAFE_128BIT);
        if (ret < 0)
                goto clean;
 

diff --git a/examples/lorem.c b/examples/lorem.c
index cfeaebb..ac6955f 100644 (file)
--- a/examples/lorem.c
+++ b/examples/lorem.c
@@ -18,7 +18,7 @@
 
 /**
  * @file lorem.c
- * @brief
+ * @brief Lorem Ipsum
  */
 
 const char *lorem8 = "Lorem i";

diff --git a/examples/sign.c b/examples/sign.c
index eb3fc28..dbec172 100644 (file)
--- a/examples/sign.c
+++ b/examples/sign.c
@@ -110,7 +110,7 @@ void sign_verify_rsa(void)
 
        // GENERATE
 
-       if (yaca_key_gen_pair(&prv, &pub, YACA_KEY_4096BIT, YACA_KEY_TYPE_PAIR_RSA))
+       if (yaca_key_gen_pair(&prv, &pub, YACA_KEY_TYPE_PAIR_RSA, YACA_KEY_4096BIT))
                return;
 
 
@@ -160,7 +160,7 @@ void sign_verify_hmac(void)
 
        // GENERATE
 
-       if (yaca_key_gen(&key, YACA_KEY_256BIT, YACA_KEY_TYPE_SYMMETRIC))
+       if (yaca_key_gen(&key, YACA_KEY_TYPE_SYMMETRIC, YACA_KEY_256BIT))
                return;
 
        // SIGN
@@ -197,7 +197,7 @@ void sign_verify_cmac(void)
 
        // GENERATE
 
-       if( yaca_key_gen(&key, YACA_KEY_256BIT, YACA_KEY_TYPE_SYMMETRIC))
+       if( yaca_key_gen(&key, YACA_KEY_TYPE_SYMMETRIC, YACA_KEY_256BIT))
                return;
 
        // SIGN

diff --git a/src/key.c b/src/key.c
index 65245d0..78dd5c8 100644 (file)
--- a/src/key.c
+++ b/src/key.c
@@ -46,6 +46,7 @@ static inline void evp_key_sanity_check(const struct yaca_key_evp_s *key)
 }
 
 // TODO: do we need this variant? or the two above are enough?
+#if 0
 static inline void key_sanity_check(const yaca_key_h key)
 {
        const struct yaca_key_simple_s *simple_key = key_get_simple(key);
@@ -57,6 +58,7 @@ static inline void key_sanity_check(const yaca_key_h key)
        if (evp_key != NULL)
                evp_key_sanity_check(evp_key);
 }
+#endif
 
 struct yaca_key_simple_s *key_get_simple(const yaca_key_h key)
 {