Merge branch 'development' into beta-release-restricted

* development:
  Add description for the yotta module
  Fix missing casts on return
This commit is contained in:
Manuel Pégourié-Gonnard 2015-08-12 21:16:16 +02:00
commit 69d94c1d2d
2 changed files with 3 additions and 2 deletions

View file

@ -367,7 +367,7 @@ static inline int mbedtls_cipher_get_iv_size( const mbedtls_cipher_context_t *ct
if( ctx->iv_size != 0 )
return (int) ctx->iv_size;
return ctx->cipher_info->iv_size;
return (int) ctx->cipher_info->iv_size;
}
/**
@ -415,7 +415,7 @@ static inline int mbedtls_cipher_get_key_bitlen( const mbedtls_cipher_context_t
if( NULL == ctx || NULL == ctx->cipher_info )
return MBEDTLS_KEY_LENGTH_NONE;
return ctx->cipher_info->key_bitlen;
return (int) ctx->cipher_info->key_bitlen;
}
/**

View file

@ -1,6 +1,7 @@
{
"name": "mbedtls",
"version": "2.0.4",
"description": "The mbed TLS crypto/SSL/TLS library",
"private": true,
"licenses": [
{