mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-21 05:43:48 -07:00
mbedtls: make style
This commit is contained in:
Philippe Teuwen
parent
6324e2e746
commit
b1d6eaf2f7
177 changed files with 37224 additions and 41821 deletions
|
|
@ -45,9 +45,8 @@
|
|||
|
||||
#if defined(MBEDTLS_ASN1_PARSE_C)
|
||||
|
||||
static int pkcs12_parse_pbe_params( mbedtls_asn1_buf *params,
|
||||
mbedtls_asn1_buf *salt, int *iterations )
|
||||
{
|
||||
static int pkcs12_parse_pbe_params(mbedtls_asn1_buf *params,
|
||||
mbedtls_asn1_buf *salt, int *iterations) {
|
||||
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
||||
unsigned char **p = ¶ms->p;
|
||||
const unsigned char *end = params->p + params->len;
|
||||
|
|
@ -59,77 +58,73 @@ static int pkcs12_parse_pbe_params( mbedtls_asn1_buf *params,
|
|||
* }
|
||||
*
|
||||
*/
|
||||
if( params->tag != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
|
||||
return( MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT +
|
||||
MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
|
||||
if (params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE))
|
||||
return (MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT +
|
||||
MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
|
||||
|
||||
if( ( ret = mbedtls_asn1_get_tag( p, end, &salt->len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
|
||||
return( MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT + ret );
|
||||
if ((ret = mbedtls_asn1_get_tag(p, end, &salt->len, MBEDTLS_ASN1_OCTET_STRING)) != 0)
|
||||
return (MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT + ret);
|
||||
|
||||
salt->p = *p;
|
||||
*p += salt->len;
|
||||
|
||||
if( ( ret = mbedtls_asn1_get_int( p, end, iterations ) ) != 0 )
|
||||
return( MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT + ret );
|
||||
if ((ret = mbedtls_asn1_get_int(p, end, iterations)) != 0)
|
||||
return (MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT + ret);
|
||||
|
||||
if( *p != end )
|
||||
return( MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT +
|
||||
MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
|
||||
if (*p != end)
|
||||
return (MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT +
|
||||
MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
|
||||
|
||||
return( 0 );
|
||||
return (0);
|
||||
}
|
||||
|
||||
#define PKCS12_MAX_PWDLEN 128
|
||||
|
||||
static int pkcs12_pbe_derive_key_iv( mbedtls_asn1_buf *pbe_params, mbedtls_md_type_t md_type,
|
||||
const unsigned char *pwd, size_t pwdlen,
|
||||
unsigned char *key, size_t keylen,
|
||||
unsigned char *iv, size_t ivlen )
|
||||
{
|
||||
static int pkcs12_pbe_derive_key_iv(mbedtls_asn1_buf *pbe_params, mbedtls_md_type_t md_type,
|
||||
const unsigned char *pwd, size_t pwdlen,
|
||||
unsigned char *key, size_t keylen,
|
||||
unsigned char *iv, size_t ivlen) {
|
||||
int ret, iterations = 0;
|
||||
mbedtls_asn1_buf salt;
|
||||
size_t i;
|
||||
unsigned char unipwd[PKCS12_MAX_PWDLEN * 2 + 2];
|
||||
|
||||
if( pwdlen > PKCS12_MAX_PWDLEN )
|
||||
return( MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA );
|
||||
if (pwdlen > PKCS12_MAX_PWDLEN)
|
||||
return (MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA);
|
||||
|
||||
memset( &salt, 0, sizeof(mbedtls_asn1_buf) );
|
||||
memset( &unipwd, 0, sizeof(unipwd) );
|
||||
memset(&salt, 0, sizeof(mbedtls_asn1_buf));
|
||||
memset(&unipwd, 0, sizeof(unipwd));
|
||||
|
||||
if( ( ret = pkcs12_parse_pbe_params( pbe_params, &salt,
|
||||
&iterations ) ) != 0 )
|
||||
return( ret );
|
||||
if ((ret = pkcs12_parse_pbe_params(pbe_params, &salt,
|
||||
&iterations)) != 0)
|
||||
return (ret);
|
||||
|
||||
for( i = 0; i < pwdlen; i++ )
|
||||
for (i = 0; i < pwdlen; i++)
|
||||
unipwd[i * 2 + 1] = pwd[i];
|
||||
|
||||
if( ( ret = mbedtls_pkcs12_derivation( key, keylen, unipwd, pwdlen * 2 + 2,
|
||||
salt.p, salt.len, md_type,
|
||||
MBEDTLS_PKCS12_DERIVE_KEY, iterations ) ) != 0 )
|
||||
{
|
||||
return( ret );
|
||||
if ((ret = mbedtls_pkcs12_derivation(key, keylen, unipwd, pwdlen * 2 + 2,
|
||||
salt.p, salt.len, md_type,
|
||||
MBEDTLS_PKCS12_DERIVE_KEY, iterations)) != 0) {
|
||||
return (ret);
|
||||
}
|
||||
|
||||
if( iv == NULL || ivlen == 0 )
|
||||
return( 0 );
|
||||
if (iv == NULL || ivlen == 0)
|
||||
return (0);
|
||||
|
||||
if( ( ret = mbedtls_pkcs12_derivation( iv, ivlen, unipwd, pwdlen * 2 + 2,
|
||||
salt.p, salt.len, md_type,
|
||||
MBEDTLS_PKCS12_DERIVE_IV, iterations ) ) != 0 )
|
||||
{
|
||||
return( ret );
|
||||
if ((ret = mbedtls_pkcs12_derivation(iv, ivlen, unipwd, pwdlen * 2 + 2,
|
||||
salt.p, salt.len, md_type,
|
||||
MBEDTLS_PKCS12_DERIVE_IV, iterations)) != 0) {
|
||||
return (ret);
|
||||
}
|
||||
return( 0 );
|
||||
return (0);
|
||||
}
|
||||
|
||||
#undef PKCS12_MAX_PWDLEN
|
||||
|
||||
int mbedtls_pkcs12_pbe_sha1_rc4_128( mbedtls_asn1_buf *pbe_params, int mode,
|
||||
const unsigned char *pwd, size_t pwdlen,
|
||||
const unsigned char *data, size_t len,
|
||||
unsigned char *output )
|
||||
{
|
||||
int mbedtls_pkcs12_pbe_sha1_rc4_128(mbedtls_asn1_buf *pbe_params, int mode,
|
||||
const unsigned char *pwd, size_t pwdlen,
|
||||
const unsigned char *data, size_t len,
|
||||
unsigned char *output) {
|
||||
#if !defined(MBEDTLS_ARC4_C)
|
||||
((void) pbe_params);
|
||||
((void) mode);
|
||||
|
|
@ -138,40 +133,38 @@ int mbedtls_pkcs12_pbe_sha1_rc4_128( mbedtls_asn1_buf *pbe_params, int mode,
|
|||
((void) data);
|
||||
((void) len);
|
||||
((void) output);
|
||||
return( MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE );
|
||||
return (MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE);
|
||||
#else
|
||||
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
||||
unsigned char key[16];
|
||||
mbedtls_arc4_context ctx;
|
||||
((void) mode);
|
||||
|
||||
mbedtls_arc4_init( &ctx );
|
||||
mbedtls_arc4_init(&ctx);
|
||||
|
||||
if( ( ret = pkcs12_pbe_derive_key_iv( pbe_params, MBEDTLS_MD_SHA1,
|
||||
pwd, pwdlen,
|
||||
key, 16, NULL, 0 ) ) != 0 )
|
||||
{
|
||||
return( ret );
|
||||
if ((ret = pkcs12_pbe_derive_key_iv(pbe_params, MBEDTLS_MD_SHA1,
|
||||
pwd, pwdlen,
|
||||
key, 16, NULL, 0)) != 0) {
|
||||
return (ret);
|
||||
}
|
||||
|
||||
mbedtls_arc4_setup( &ctx, key, 16 );
|
||||
if( ( ret = mbedtls_arc4_crypt( &ctx, len, data, output ) ) != 0 )
|
||||
mbedtls_arc4_setup(&ctx, key, 16);
|
||||
if ((ret = mbedtls_arc4_crypt(&ctx, len, data, output)) != 0)
|
||||
goto exit;
|
||||
|
||||
exit:
|
||||
mbedtls_platform_zeroize( key, sizeof( key ) );
|
||||
mbedtls_arc4_free( &ctx );
|
||||
mbedtls_platform_zeroize(key, sizeof(key));
|
||||
mbedtls_arc4_free(&ctx);
|
||||
|
||||
return( ret );
|
||||
return (ret);
|
||||
#endif /* MBEDTLS_ARC4_C */
|
||||
}
|
||||
|
||||
int mbedtls_pkcs12_pbe( mbedtls_asn1_buf *pbe_params, int mode,
|
||||
mbedtls_cipher_type_t cipher_type, mbedtls_md_type_t md_type,
|
||||
const unsigned char *pwd, size_t pwdlen,
|
||||
const unsigned char *data, size_t len,
|
||||
unsigned char *output )
|
||||
{
|
||||
int mbedtls_pkcs12_pbe(mbedtls_asn1_buf *pbe_params, int mode,
|
||||
mbedtls_cipher_type_t cipher_type, mbedtls_md_type_t md_type,
|
||||
const unsigned char *pwd, size_t pwdlen,
|
||||
const unsigned char *data, size_t len,
|
||||
unsigned char *output) {
|
||||
int ret, keylen = 0;
|
||||
unsigned char key[32];
|
||||
unsigned char iv[16];
|
||||
|
|
@ -179,72 +172,67 @@ int mbedtls_pkcs12_pbe( mbedtls_asn1_buf *pbe_params, int mode,
|
|||
mbedtls_cipher_context_t cipher_ctx;
|
||||
size_t olen = 0;
|
||||
|
||||
cipher_info = mbedtls_cipher_info_from_type( cipher_type );
|
||||
if( cipher_info == NULL )
|
||||
return( MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE );
|
||||
cipher_info = mbedtls_cipher_info_from_type(cipher_type);
|
||||
if (cipher_info == NULL)
|
||||
return (MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE);
|
||||
|
||||
keylen = cipher_info->key_bitlen / 8;
|
||||
|
||||
if( ( ret = pkcs12_pbe_derive_key_iv( pbe_params, md_type, pwd, pwdlen,
|
||||
key, keylen,
|
||||
iv, cipher_info->iv_size ) ) != 0 )
|
||||
{
|
||||
return( ret );
|
||||
if ((ret = pkcs12_pbe_derive_key_iv(pbe_params, md_type, pwd, pwdlen,
|
||||
key, keylen,
|
||||
iv, cipher_info->iv_size)) != 0) {
|
||||
return (ret);
|
||||
}
|
||||
|
||||
mbedtls_cipher_init( &cipher_ctx );
|
||||
mbedtls_cipher_init(&cipher_ctx);
|
||||
|
||||
if( ( ret = mbedtls_cipher_setup( &cipher_ctx, cipher_info ) ) != 0 )
|
||||
if ((ret = mbedtls_cipher_setup(&cipher_ctx, cipher_info)) != 0)
|
||||
goto exit;
|
||||
|
||||
if( ( ret = mbedtls_cipher_setkey( &cipher_ctx, key, 8 * keylen, (mbedtls_operation_t) mode ) ) != 0 )
|
||||
if ((ret = mbedtls_cipher_setkey(&cipher_ctx, key, 8 * keylen, (mbedtls_operation_t) mode)) != 0)
|
||||
goto exit;
|
||||
|
||||
if( ( ret = mbedtls_cipher_set_iv( &cipher_ctx, iv, cipher_info->iv_size ) ) != 0 )
|
||||
if ((ret = mbedtls_cipher_set_iv(&cipher_ctx, iv, cipher_info->iv_size)) != 0)
|
||||
goto exit;
|
||||
|
||||
if( ( ret = mbedtls_cipher_reset( &cipher_ctx ) ) != 0 )
|
||||
if ((ret = mbedtls_cipher_reset(&cipher_ctx)) != 0)
|
||||
goto exit;
|
||||
|
||||
if( ( ret = mbedtls_cipher_update( &cipher_ctx, data, len,
|
||||
output, &olen ) ) != 0 )
|
||||
{
|
||||
if ((ret = mbedtls_cipher_update(&cipher_ctx, data, len,
|
||||
output, &olen)) != 0) {
|
||||
goto exit;
|
||||
}
|
||||
|
||||
if( ( ret = mbedtls_cipher_finish( &cipher_ctx, output + olen, &olen ) ) != 0 )
|
||||
if ((ret = mbedtls_cipher_finish(&cipher_ctx, output + olen, &olen)) != 0)
|
||||
ret = MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH;
|
||||
|
||||
exit:
|
||||
mbedtls_platform_zeroize( key, sizeof( key ) );
|
||||
mbedtls_platform_zeroize( iv, sizeof( iv ) );
|
||||
mbedtls_cipher_free( &cipher_ctx );
|
||||
mbedtls_platform_zeroize(key, sizeof(key));
|
||||
mbedtls_platform_zeroize(iv, sizeof(iv));
|
||||
mbedtls_cipher_free(&cipher_ctx);
|
||||
|
||||
return( ret );
|
||||
return (ret);
|
||||
}
|
||||
|
||||
#endif /* MBEDTLS_ASN1_PARSE_C */
|
||||
|
||||
static void pkcs12_fill_buffer( unsigned char *data, size_t data_len,
|
||||
const unsigned char *filler, size_t fill_len )
|
||||
{
|
||||
static void pkcs12_fill_buffer(unsigned char *data, size_t data_len,
|
||||
const unsigned char *filler, size_t fill_len) {
|
||||
unsigned char *p = data;
|
||||
size_t use_len;
|
||||
|
||||
while( data_len > 0 )
|
||||
{
|
||||
use_len = ( data_len > fill_len ) ? fill_len : data_len;
|
||||
memcpy( p, filler, use_len );
|
||||
while (data_len > 0) {
|
||||
use_len = (data_len > fill_len) ? fill_len : data_len;
|
||||
memcpy(p, filler, use_len);
|
||||
p += use_len;
|
||||
data_len -= use_len;
|
||||
}
|
||||
}
|
||||
|
||||
int mbedtls_pkcs12_derivation( unsigned char *data, size_t datalen,
|
||||
const unsigned char *pwd, size_t pwdlen,
|
||||
const unsigned char *salt, size_t saltlen,
|
||||
mbedtls_md_type_t md_type, int id, int iterations )
|
||||
{
|
||||
int mbedtls_pkcs12_derivation(unsigned char *data, size_t datalen,
|
||||
const unsigned char *pwd, size_t pwdlen,
|
||||
const unsigned char *salt, size_t saltlen,
|
||||
mbedtls_md_type_t md_type, int id, int iterations) {
|
||||
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
||||
unsigned int j;
|
||||
|
||||
|
|
@ -260,86 +248,82 @@ int mbedtls_pkcs12_derivation( unsigned char *data, size_t datalen,
|
|||
mbedtls_md_context_t md_ctx;
|
||||
|
||||
// This version only allows max of 64 bytes of password or salt
|
||||
if( datalen > 128 || pwdlen > 64 || saltlen > 64 )
|
||||
return( MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA );
|
||||
if (datalen > 128 || pwdlen > 64 || saltlen > 64)
|
||||
return (MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA);
|
||||
|
||||
md_info = mbedtls_md_info_from_type( md_type );
|
||||
if( md_info == NULL )
|
||||
return( MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE );
|
||||
md_info = mbedtls_md_info_from_type(md_type);
|
||||
if (md_info == NULL)
|
||||
return (MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE);
|
||||
|
||||
mbedtls_md_init( &md_ctx );
|
||||
mbedtls_md_init(&md_ctx);
|
||||
|
||||
if( ( ret = mbedtls_md_setup( &md_ctx, md_info, 0 ) ) != 0 )
|
||||
return( ret );
|
||||
hlen = mbedtls_md_get_size( md_info );
|
||||
if ((ret = mbedtls_md_setup(&md_ctx, md_info, 0)) != 0)
|
||||
return (ret);
|
||||
hlen = mbedtls_md_get_size(md_info);
|
||||
|
||||
if( hlen <= 32 )
|
||||
if (hlen <= 32)
|
||||
v = 64;
|
||||
else
|
||||
v = 128;
|
||||
|
||||
memset( diversifier, (unsigned char) id, v );
|
||||
memset(diversifier, (unsigned char) id, v);
|
||||
|
||||
pkcs12_fill_buffer( salt_block, v, salt, saltlen );
|
||||
pkcs12_fill_buffer( pwd_block, v, pwd, pwdlen );
|
||||
pkcs12_fill_buffer(salt_block, v, salt, saltlen);
|
||||
pkcs12_fill_buffer(pwd_block, v, pwd, pwdlen);
|
||||
|
||||
p = data;
|
||||
while( datalen > 0 )
|
||||
{
|
||||
while (datalen > 0) {
|
||||
// Calculate hash( diversifier || salt_block || pwd_block )
|
||||
if( ( ret = mbedtls_md_starts( &md_ctx ) ) != 0 )
|
||||
if ((ret = mbedtls_md_starts(&md_ctx)) != 0)
|
||||
goto exit;
|
||||
|
||||
if( ( ret = mbedtls_md_update( &md_ctx, diversifier, v ) ) != 0 )
|
||||
if ((ret = mbedtls_md_update(&md_ctx, diversifier, v)) != 0)
|
||||
goto exit;
|
||||
|
||||
if( ( ret = mbedtls_md_update( &md_ctx, salt_block, v ) ) != 0 )
|
||||
if ((ret = mbedtls_md_update(&md_ctx, salt_block, v)) != 0)
|
||||
goto exit;
|
||||
|
||||
if( ( ret = mbedtls_md_update( &md_ctx, pwd_block, v ) ) != 0 )
|
||||
if ((ret = mbedtls_md_update(&md_ctx, pwd_block, v)) != 0)
|
||||
goto exit;
|
||||
|
||||
if( ( ret = mbedtls_md_finish( &md_ctx, hash_output ) ) != 0 )
|
||||
if ((ret = mbedtls_md_finish(&md_ctx, hash_output)) != 0)
|
||||
goto exit;
|
||||
|
||||
// Perform remaining ( iterations - 1 ) recursive hash calculations
|
||||
for( i = 1; i < (size_t) iterations; i++ )
|
||||
{
|
||||
if( ( ret = mbedtls_md( md_info, hash_output, hlen, hash_output ) ) != 0 )
|
||||
for (i = 1; i < (size_t) iterations; i++) {
|
||||
if ((ret = mbedtls_md(md_info, hash_output, hlen, hash_output)) != 0)
|
||||
goto exit;
|
||||
}
|
||||
|
||||
use_len = ( datalen > hlen ) ? hlen : datalen;
|
||||
memcpy( p, hash_output, use_len );
|
||||
use_len = (datalen > hlen) ? hlen : datalen;
|
||||
memcpy(p, hash_output, use_len);
|
||||
datalen -= use_len;
|
||||
p += use_len;
|
||||
|
||||
if( datalen == 0 )
|
||||
if (datalen == 0)
|
||||
break;
|
||||
|
||||
// Concatenating copies of hash_output into hash_block (B)
|
||||
pkcs12_fill_buffer( hash_block, v, hash_output, hlen );
|
||||
pkcs12_fill_buffer(hash_block, v, hash_output, hlen);
|
||||
|
||||
// B += 1
|
||||
for( i = v; i > 0; i-- )
|
||||
if( ++hash_block[i - 1] != 0 )
|
||||
for (i = v; i > 0; i--)
|
||||
if (++hash_block[i - 1] != 0)
|
||||
break;
|
||||
|
||||
// salt_block += B
|
||||
c = 0;
|
||||
for( i = v; i > 0; i-- )
|
||||
{
|
||||
for (i = v; i > 0; i--) {
|
||||
j = salt_block[i - 1] + hash_block[i - 1] + c;
|
||||
c = (unsigned char) (j >> 8);
|
||||
c = (unsigned char)(j >> 8);
|
||||
salt_block[i - 1] = j & 0xFF;
|
||||
}
|
||||
|
||||
// pwd_block += B
|
||||
c = 0;
|
||||
for( i = v; i > 0; i-- )
|
||||
{
|
||||
for (i = v; i > 0; i--) {
|
||||
j = pwd_block[i - 1] + hash_block[i - 1] + c;
|
||||
c = (unsigned char) (j >> 8);
|
||||
c = (unsigned char)(j >> 8);
|
||||
pwd_block[i - 1] = j & 0xFF;
|
||||
}
|
||||
}
|
||||
|
|
@ -347,14 +331,14 @@ int mbedtls_pkcs12_derivation( unsigned char *data, size_t datalen,
|
|||
ret = 0;
|
||||
|
||||
exit:
|
||||
mbedtls_platform_zeroize( salt_block, sizeof( salt_block ) );
|
||||
mbedtls_platform_zeroize( pwd_block, sizeof( pwd_block ) );
|
||||
mbedtls_platform_zeroize( hash_block, sizeof( hash_block ) );
|
||||
mbedtls_platform_zeroize( hash_output, sizeof( hash_output ) );
|
||||
mbedtls_platform_zeroize(salt_block, sizeof(salt_block));
|
||||
mbedtls_platform_zeroize(pwd_block, sizeof(pwd_block));
|
||||
mbedtls_platform_zeroize(hash_block, sizeof(hash_block));
|
||||
mbedtls_platform_zeroize(hash_output, sizeof(hash_output));
|
||||
|
||||
mbedtls_md_free( &md_ctx );
|
||||
mbedtls_md_free(&md_ctx);
|
||||
|
||||
return( ret );
|
||||
return (ret);
|
||||
}
|
||||
|
||||
#endif /* MBEDTLS_PKCS12_C */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue