commit 6963ff096963a7875a76cbe9e94b14cabc20857a
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Apr 28 18:02:54 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Apr 28 18:02:54 2015 +0200
tree af3dcc2682d377f580ca22c507da63afa36338e2
parent d54e617ea618e2465842ffa04d03b784cb642c8e

Split mbedtls_ccm_init() -> setkey()

library/cipher_wrap.c

diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c
index ebc3c4f..eb291b6 100644
--- a/library/cipher_wrap.c
+++ b/library/cipher_wrap.c
@@ -395,7 +395,7 @@
 static int ccm_aes_setkey_wrap( void *ctx, const unsigned char *key,
                                 unsigned int key_length )
 {
-    return mbedtls_ccm_init( (mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_AES,
+    return mbedtls_ccm_setkey( (mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_AES,
                      key, key_length );
 }
 
@@ -752,7 +752,7 @@
 static int ccm_camellia_setkey_wrap( void *ctx, const unsigned char *key,
                                      unsigned int key_length )
 {
-    return mbedtls_ccm_init( (mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_CAMELLIA,
+    return mbedtls_ccm_setkey( (mbedtls_ccm_context *) ctx, MBEDTLS_CIPHER_ID_CAMELLIA,
                      key, key_length );
 }