yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-05-01 19:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address review comments

Browse source
This commit is contained in:
Hanno Becker 2019-06-14 17:21:24 +01:00
parent b1cb0bde72
commit c6043f2b75
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mbedtls/x509_crl.h
View file

@ -150,7 +150,7 @@ int mbedtls_x509_crl_parse_file( mbedtls_x509_crl *chain, const char *path );
*/ */
int mbedtls_x509_crl_info( char *buf, size_t size, const char *prefix, int mbedtls_x509_crl_info( char *buf, size_t size, const char *prefix,
const mbedtls_x509_crl *crl ); const mbedtls_x509_crl *crl );
#endif #endif /* !MBEDTLS_X509_REMOVE_INFO */
/** /**
* \brief Initialize a CRL (chain) * \brief Initialize a CRL (chain)

4
include/mbedtls/x509_crt.h
View file

@ -354,9 +354,7 @@ int mbedtls_x509_crt_parse_path( mbedtls_x509_crt *chain, const char *path );
*/ */
int mbedtls_x509_crt_info( char *buf, size_t size, const char *prefix, int mbedtls_x509_crt_info( char *buf, size_t size, const char *prefix,
const mbedtls_x509_crt *crt ); const mbedtls_x509_crt *crt );
#endif
#if !defined(MBEDTLS_X509_REMOVE_INFO)
/** /**
* \brief Returns an informational string about the * \brief Returns an informational string about the
* verification status of a certificate. * verification status of a certificate.
@ -371,7 +369,7 @@ int mbedtls_x509_crt_info( char *buf, size_t size, const char *prefix,
*/ */
int mbedtls_x509_crt_verify_info( char *buf, size_t size, const char *prefix, int mbedtls_x509_crt_verify_info( char *buf, size_t size, const char *prefix,
uint32_t flags ); uint32_t flags );
#endif #endif /* !MBEDTLS_X509_REMOVE_INFO */
/** /**
* \brief Verify the certificate signature * \brief Verify the certificate signature

2
include/mbedtls/x509_csr.h
View file

@ -138,7 +138,7 @@ int mbedtls_x509_csr_parse_file( mbedtls_x509_csr *csr, const char *path );
*/ */
int mbedtls_x509_csr_info( char *buf, size_t size, const char *prefix, int mbedtls_x509_csr_info( char *buf, size_t size, const char *prefix,
const mbedtls_x509_csr *csr ); const mbedtls_x509_csr *csr );
#endif #endif /* !MBEDTLS_X509_REMOVE_INFO */
/** /**
* \brief Initialize a CSR * \brief Initialize a CSR

12
library/oid.c
View file

@ -283,15 +283,15 @@ static const oid_x509_ext_t oid_x509_ext[] =
MBEDTLS_X509_EXT_KEY_USAGE, MBEDTLS_X509_EXT_KEY_USAGE,
}, },
{ {
OID_DESCRIPTOR( MBEDTLS_OID_EXTENDED_KEY_USAGE, "id-ce-extKeyUsage", "Extended Key Usage" ), OID_DESCRIPTOR( MBEDTLS_OID_EXTENDED_KEY_USAGE, "id-ce-extKeyUsage", "Extended Key Usage" ),
MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE, MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE,
}, },
{ {
OID_DESCRIPTOR( MBEDTLS_OID_SUBJECT_ALT_NAME, "id-ce-subjectAltName", "Subject Alt Name" ), OID_DESCRIPTOR( MBEDTLS_OID_SUBJECT_ALT_NAME, "id-ce-subjectAltName", "Subject Alt Name" ),
MBEDTLS_X509_EXT_SUBJECT_ALT_NAME, MBEDTLS_X509_EXT_SUBJECT_ALT_NAME,
}, },
{ {
OID_DESCRIPTOR( MBEDTLS_OID_NS_CERT_TYPE, "id-netscape-certtype", "Netscape Certificate Type" ), OID_DESCRIPTOR( MBEDTLS_OID_NS_CERT_TYPE, "id-netscape-certtype", "Netscape Certificate Type" ),
MBEDTLS_X509_EXT_NS_CERT_TYPE, MBEDTLS_X509_EXT_NS_CERT_TYPE,
}, },
{ {
@ -446,15 +446,15 @@ typedef struct {
static const oid_pk_alg_t oid_pk_alg[] = static const oid_pk_alg_t oid_pk_alg[] =
{ {
{ {
OID_DESCRIPTOR( MBEDTLS_OID_PKCS1_RSA, "rsaEncryption", "RSA" ), OID_DESCRIPTOR( MBEDTLS_OID_PKCS1_RSA, "rsaEncryption", "RSA" ),
MBEDTLS_PK_RSA, MBEDTLS_PK_RSA,
}, },
{ {
OID_DESCRIPTOR( MBEDTLS_OID_EC_ALG_UNRESTRICTED, "id-ecPublicKey", "Generic EC key" ), OID_DESCRIPTOR( MBEDTLS_OID_EC_ALG_UNRESTRICTED, "id-ecPublicKey", "Generic EC key" ),
MBEDTLS_PK_ECKEY, MBEDTLS_PK_ECKEY,
}, },
{ {
OID_DESCRIPTOR( MBEDTLS_OID_EC_ALG_ECDH, "id-ecDH", "EC key for ECDH" ), OID_DESCRIPTOR( MBEDTLS_OID_EC_ALG_ECDH, "id-ecDH", "EC key for ECDH" ),
MBEDTLS_PK_ECKEY_DH, MBEDTLS_PK_ECKEY_DH,
}, },
{ {