Merge pull request #5983 from gstrauss/inline-mbedtls_x509_dn_get_next

Inline mbedtls_x509_dn_get_next() in x509.h
This commit is contained in:
Manuel Pégourié-Gonnard 2022-06-28 10:13:58 +02:00 committed by GitHub
commit 273453f126
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions

View file

@ -269,12 +269,21 @@ int mbedtls_x509_dn_gets( char *buf, size_t size, const mbedtls_x509_name *dn );
/**
* \brief Return the next relative DN in an X509 name.
*
* \note Intended use is to compare function result to dn->next
* in order to detect boundaries of multi-valued RDNs.
*
* \param dn Current node in the X509 name
*
* \return Pointer to the first attribute-value pair of the
* next RDN in sequence, or NULL if end is reached.
*/
mbedtls_x509_name * mbedtls_x509_dn_get_next( mbedtls_x509_name *dn );
static inline mbedtls_x509_name * mbedtls_x509_dn_get_next(
mbedtls_x509_name * dn )
{
while( dn->MBEDTLS_PRIVATE(next_merged) && dn->next != NULL )
dn = dn->next;
return( dn->next );
}
/**
* \brief Store the certificate serial in printable form into buf;

View file

@ -796,15 +796,6 @@ int mbedtls_x509_dn_gets( char *buf, size_t size, const mbedtls_x509_name *dn )
return( (int) ( size - n ) );
}
/*
* Return the next relative DN in an X509 name.
*/
mbedtls_x509_name * mbedtls_x509_dn_get_next( mbedtls_x509_name * dn )
{
for( ; dn->next != NULL && dn->next_merged; dn = dn->next );
return( dn->next );
}
/*
* Store the serial in printable form into buf; no more
* than size characters will be written