cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-10-04 19:16:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improving readability

Browse Source 
Signed-off-by: pespacek <peter.spacek@silabs.com>
This commit is contained in:
pespacek 2022-02-17 15:18:47 +01:00
parent a6e955e729
commit 3015148ae6
1 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
library/x509write_crt.c
View File

@ -187,27 +187,19 @@ static int mbedtls_x509write_crt_set_key_identifier( mbedtls_x509write_cert
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */
memset( buf, 0, sizeof(buf) ); memset( buf, 0, sizeof(buf) );
if( is_ca ) MBEDTLS_ASN1_CHK_ADD( len, mbedtls_pk_write_pubkey( &c,
{
MBEDTLS_ASN1_CHK_ADD( len,
mbedtls_pk_write_pubkey( &c,
buf,
ctx->issuer_key ) );
}
else
{
MBEDTLS_ASN1_CHK_ADD( len,
mbedtls_pk_write_pubkey( &c,
buf, buf,
is_ca ?
ctx->issuer_key :
ctx->subject_key ) ); ctx->subject_key ) );
}
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
status = psa_hash_compute( PSA_ALG_SHA_1, status = psa_hash_compute( PSA_ALG_SHA_1,
buf + sizeof(buf) - len, buf + sizeof(buf) - len,
len, len,
buf + sizeof(buf) - 20, buf + sizeof(buf) - 20,
PSA_HASH_LENGTH(PSA_ALG_SHA_1), 20,
&hash_length ); &hash_length );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
{ {
@ -235,24 +227,18 @@ static int mbedtls_x509write_crt_set_key_identifier( mbedtls_x509write_cert
buf, buf,
MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_CONSTRUCTED |
MBEDTLS_ASN1_SEQUENCE ) ); MBEDTLS_ASN1_SEQUENCE ) );
return mbedtls_x509write_crt_set_extension(
ctx,
MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER,
MBEDTLS_OID_SIZE( MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER ),
0,
buf + sizeof( buf ) - len,
len );
} }
else
{
return mbedtls_x509write_crt_set_extension( return mbedtls_x509write_crt_set_extension(
ctx, ctx,
is_ca ? MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER :
MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER, MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER,
MBEDTLS_OID_SIZE( MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER ), is_ca ? MBEDTLS_OID_SIZE(
MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER ) :
MBEDTLS_OID_SIZE(
MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER ),
0, 0,
buf + sizeof( buf ) - len, buf + sizeof( buf ) - len,
len ); len );
}
} }
int mbedtls_x509write_crt_set_subject_key_identifier( mbedtls_x509write_cert *ctx ) int mbedtls_x509write_crt_set_subject_key_identifier( mbedtls_x509write_cert *ctx )