yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-08-08 17:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into beta-release-restricted

Browse source 
* 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
parent 83e8bbb019 addd52fdde
commit 69d94c1d2d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mbedtls/cipher.h
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 ) if( ctx->iv_size != 0 )
return (int) ctx->iv_size; 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 ) if( NULL == ctx || NULL == ctx->cipher_info )
return MBEDTLS_KEY_LENGTH_NONE; return MBEDTLS_KEY_LENGTH_NONE;
return ctx->cipher_info->key_bitlen; return (int) ctx->cipher_info->key_bitlen;
} }
/** /**

1
yotta/data/module.json
View file

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