From dd12390801df876191cb6ef5557b1082baf92ba3 Mon Sep 17 00:00:00 2001 From: toth92g Date: Thu, 8 Apr 2021 10:12:52 +0200 Subject: [PATCH] Updating the new code parts based on the coding standards: adding missing whitespaces to brackets Signed-off-by: toth92g --- library/oid.c | 4 +-- library/x509_crt.c | 68 +++++++++++++++++++++++----------------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/library/oid.c b/library/oid.c index 732b3866e5..a2d8f8e967 100644 --- a/library/oid.c +++ b/library/oid.c @@ -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, }, { diff --git a/library/x509_crt.c b/library/x509_crt.c index 0aca50fd0c..5395f455df 100644 --- a/library/x509_crt.c +++ b/library/x509_crt.c @@ -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 )