TeamHepta/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-04-11 23:00:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updating the new code parts based on the coding standards: adding missing whitespaces to brackets

Browse Source 
Signed-off-by: toth92g <toth92g@gmail.com>
This commit is contained in:
toth92g
2021-04-08 10:12:52 +02:00
committed by Przemek Stekiel
parent cdfdc680c0
commit dd12390801
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/oid.c
View File

@@ -291,11 +291,11 @@ static const oid_x509_ext_t oid_x509_ext[] =
MBEDTLS_OID_X509_EXT_CERTIFICATE_POLICIES,
},
{
{ ADD_LEN(MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER), "id-ce-subjectKeyIdentifier", "Subject Key Identifier" },
{ ADD_LEN(MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER ), "id-ce-subjectKeyIdentifier", "Subject Key Identifier" },
MBEDTLS_OID_X509_EXT_SUBJECT_KEY_IDENTIFIER,
},
{
{ ADD_LEN(MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER), "id-ce-authorityKeyIdentifier", "Authority Key Identifier" },
{ ADD_LEN(MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER ), "id-ce-authorityKeyIdentifier", "Authority Key Identifier" },
MBEDTLS_OID_X509_EXT_AUTHORITY_KEY_IDENTIFIER,
},
{

68
library/x509_crt.c
View File

@@ -617,17 +617,17 @@ static int x509_get_ext_key_usage( unsigned char **p,
*
* KeyIdentifier ::= OCTET STRING
*/
static int x509_get_subject_key_id(unsigned char** p,
static int x509_get_subject_key_id( unsigned char** p,
const unsigned char* end,
mbedtls_x509_buf* subject_key_id)
mbedtls_x509_buf* subject_key_id )
{
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
size_t len = 0u;
if ((ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_OCTET_STRING)) != 0)
if ( (ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_OCTET_STRING)) != 0 )
{
return(ret);
return( ret );
}
else
{
@@ -637,7 +637,7 @@ static int x509_get_subject_key_id(unsigned char** p,
*p += len;
}
return(0);
return( 0 );
}
/*
@@ -648,21 +648,21 @@ static int x509_get_subject_key_id(unsigned char** p,
*
* KeyIdentifier ::= OCTET STRING
*/
static int x509_get_authority_key_id(unsigned char** p,
static int x509_get_authority_key_id( unsigned char** p,
unsigned char* end,
mbedtls_x509_authority* authority_key_id)
mbedtls_x509_authority* authority_key_id )
{
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
size_t len = 0u;
if ((ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
if ( (ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0 )
{
return(ret);
return( ret );
}
if ((ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONTEXT_SPECIFIC)) != 0)
if ( (ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONTEXT_SPECIFIC)) != 0 )
{
/* KeyIdentifier is an OPTIONAL field */
}
@@ -677,31 +677,31 @@ static int x509_get_authority_key_id(unsigned char** p,
if ( *p < end )
{
if ((ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_BOOLEAN)) != 0)
if ( (ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_BOOLEAN)) != 0 )
{
/* authorityCertIssuer is an OPTIONAL field */
}
else
{
if ((ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_OCTET_STRING)) != 0)
if ( (ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_OCTET_STRING)) != 0 )
{
return(ret);
return( ret );
}
else
{
authority_key_id->raw.p = *p;
if ((ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0)
if ( (ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0 )
{
return(ret);
return( ret );
}
if ((ret = mbedtls_x509_get_name(p, *p + len, &authority_key_id->authorityCertIssuer)) != 0)
if ( (ret = mbedtls_x509_get_name(p, *p + len, &authority_key_id->authorityCertIssuer)) != 0 )
{
return(ret);
return( ret );
}
authority_key_id->raw.len = *p - authority_key_id->raw.p;
@@ -711,11 +711,11 @@ static int x509_get_authority_key_id(unsigned char** p,
if ( *p < end )
{
if ((ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_INTEGER)) != 0)
if ( (ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_INTEGER)) != 0 )
{
/* authorityCertSerialNumber is an OPTIONAL field, but if there are still data it must be the serial number */
return(ret);
return( ret );
}
else
{
@@ -726,13 +726,13 @@ static int x509_get_authority_key_id(unsigned char** p,
}
}
if (*p != end)
if ( *p != end )
{
return(MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS +
MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
}
return(0);
return( 0 );
}
/*
@@ -1141,7 +1141,7 @@ static int x509_get_crt_ext( unsigned char **p,
if ( (ret = x509_get_authority_key_id(p, end_ext_octet,
&crt->authority_key_id)) != 0 )
{
return (ret);
return ( ret );
}
break;
case MBEDTLS_X509_EXT_SUBJECT_ALT_NAME:
@@ -3439,12 +3439,12 @@ void mbedtls_x509_crt_free( mbedtls_x509_crt *crt )
mbedtls_asn1_sequence_free( cert_cur->certificate_policies.next );
name_cur = cert_cur->authority_key_id.authorityCertIssuer.next;
while (name_cur != NULL)
while ( name_cur != NULL )
{
name_prv = name_cur;
name_cur = name_cur->next;
mbedtls_platform_zeroize(name_prv, sizeof(mbedtls_x509_name));
mbedtls_free(name_prv);
mbedtls_platform_zeroize( name_prv, sizeof(mbedtls_x509_name) );
mbedtls_free( name_prv );
}
if( cert_cur->raw.p != NULL && cert_cur->own_buffer )