Handle NULL return from os_zalloc() in sta_track_add()

[mech_eap.git] / src / crypto / aes-siv.c

diff --git a/src/crypto/aes-siv.c b/src/crypto/aes-siv.c
index bd619b4..5ac82c2 100644 (file)
--- a/src/crypto/aes-siv.c
+++ b/src/crypto/aes-siv.c
@@ -11,6 +11,7 @@
 #include "common.h"
 #include "aes.h"
 #include "aes_wrap.h"
+#include "aes_siv.h"
 
 
 static const u8 zero[AES_BLOCK_SIZE];
@@ -50,7 +51,7 @@ static void xorend(u8 *a, int alen, const u8 *b, int blen)
 }
 
 
-static void pad(u8 *pad, const u8 *addr, size_t len)
+static void pad_block(u8 *pad, const u8 *addr, size_t len)
 {
        os_memset(pad, 0, AES_BLOCK_SIZE);
        os_memcpy(pad, addr, len);
@@ -60,8 +61,8 @@ static void pad(u8 *pad, const u8 *addr, size_t len)
 }
 
 
-int aes_s2v(const u8 *key, size_t num_elem, const u8 *addr[],
-           size_t *len, u8 *mac)
+static int aes_s2v(const u8 *key, size_t num_elem, const u8 *addr[],
+                  size_t *len, u8 *mac)
 {
        u8 tmp[AES_BLOCK_SIZE], tmp2[AES_BLOCK_SIZE];
        u8 *buf = NULL;
@@ -94,12 +95,12 @@ int aes_s2v(const u8 *key, size_t num_elem, const u8 *addr[],
                os_memcpy(buf, addr[i], len[i]);
                xorend(buf, len[i], tmp, AES_BLOCK_SIZE);
                ret = omac1_aes_128(key, buf, len[i], mac);
-               os_free(buf);
+               bin_clear_free(buf, len[i]);
                return ret;
        }
 
        dbl(tmp);
-       pad(tmp2, addr[i], len[i]);
+       pad_block(tmp2, addr[i], len[i]);
        xor(tmp, tmp2);
 
        return omac1_aes_128(key, tmp, sizeof(tmp), mac);