mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-28 19:13:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt function names

Browse Source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel 2023-01-16 08:47:49 +01:00
parent 685d472db3
commit 21c37288e5
3 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/mbedtls/x509.h
View File

@ -148,7 +148,7 @@
/* /*
* X.509 v3 Key Usage Extension flags * X.509 v3 Key Usage Extension flags
* Reminder: update x509_info_key_usage() when adding new flags. * Reminder: update mbedtls_x509_info_key_usage() when adding new flags.
*/ */
#define MBEDTLS_X509_KU_DIGITAL_SIGNATURE (0x80) /* bit 0 */ #define MBEDTLS_X509_KU_DIGITAL_SIGNATURE (0x80) /* bit 0 */
#define MBEDTLS_X509_KU_NON_REPUDIATION (0x40) /* bit 1 */ #define MBEDTLS_X509_KU_NON_REPUDIATION (0x40) /* bit 1 */
@ -370,22 +370,22 @@ int mbedtls_x509_write_names(unsigned char **p, unsigned char *start,
int mbedtls_x509_write_sig(unsigned char **p, unsigned char *start, int mbedtls_x509_write_sig(unsigned char **p, unsigned char *start,
const char *oid, size_t oid_len, const char *oid, size_t oid_len,
unsigned char *sig, size_t size); unsigned char *sig, size_t size);
int x509_get_ns_cert_type(unsigned char **p, int mbedtls_x509_get_ns_cert_type(unsigned char **p,
const unsigned char *end, const unsigned char *end,
unsigned char *ns_cert_type); unsigned char *ns_cert_type);
int x509_get_key_usage(unsigned char **p, int mbedtls_x509_get_key_usage(unsigned char **p,
const unsigned char *end, const unsigned char *end,
unsigned int *key_usage); unsigned int *key_usage);
int x509_get_subject_alt_name(unsigned char **p, int mbedtls_x509_get_subject_alt_name(unsigned char **p,
const unsigned char *end, const unsigned char *end,
mbedtls_x509_sequence *subject_alt_name); mbedtls_x509_sequence *subject_alt_name);
int x509_info_subject_alt_name(char **buf, size_t *size, int mbedtls_x509_info_subject_alt_name(char **buf, size_t *size,
const mbedtls_x509_sequence const mbedtls_x509_sequence
*subject_alt_name, *subject_alt_name,
const char *prefix); const char *prefix);
int x509_info_cert_type(char **buf, size_t *size, int mbedtls_x509_info_cert_type(char **buf, size_t *size,
unsigned char ns_cert_type); unsigned char ns_cert_type);
int x509_info_key_usage(char **buf, size_t *size, int mbedtls_x509_info_key_usage(char **buf, size_t *size,
unsigned int key_usage); unsigned int key_usage);
#define MBEDTLS_X509_SAFE_SNPRINTF \ #define MBEDTLS_X509_SAFE_SNPRINTF \

24
library/x509_crt.c
View File

@ -562,7 +562,7 @@ static int x509_get_basic_constraints(unsigned char **p,
return 0; return 0;
} }
int x509_get_ns_cert_type(unsigned char **p, int mbedtls_x509_get_ns_cert_type(unsigned char **p,
const unsigned char *end, const unsigned char *end,
unsigned char *ns_cert_type) unsigned char *ns_cert_type)
{ {
@ -583,7 +583,7 @@ int x509_get_ns_cert_type(unsigned char **p,
return 0; return 0;
} }
int x509_get_key_usage(unsigned char **p, int mbedtls_x509_get_key_usage(unsigned char **p,
const unsigned char *end, const unsigned char *end,
unsigned int *key_usage) unsigned int *key_usage)
{ {
@ -660,7 +660,7 @@ static int x509_get_ext_key_usage(unsigned char **p,
* NOTE: we list all types, but only use dNSName and otherName * NOTE: we list all types, but only use dNSName and otherName
* of type HwModuleName, as defined in RFC 4108, at this point. * of type HwModuleName, as defined in RFC 4108, at this point.
*/ */
int x509_get_subject_alt_name(unsigned char **p, int mbedtls_x509_get_subject_alt_name(unsigned char **p,
const unsigned char *end, const unsigned char *end,
mbedtls_x509_sequence *subject_alt_name) mbedtls_x509_sequence *subject_alt_name)
{ {
@ -1029,7 +1029,7 @@ static int x509_get_crt_ext(unsigned char **p,
case MBEDTLS_X509_EXT_KEY_USAGE: case MBEDTLS_X509_EXT_KEY_USAGE:
/* Parse key usage */ /* Parse key usage */
if ((ret = x509_get_key_usage(p, end_ext_octet, if ((ret = mbedtls_x509_get_key_usage(p, end_ext_octet,
&crt->key_usage)) != 0) { &crt->key_usage)) != 0) {
return ret; return ret;
} }
@ -1045,7 +1045,7 @@ static int x509_get_crt_ext(unsigned char **p,
case MBEDTLS_X509_EXT_SUBJECT_ALT_NAME: case MBEDTLS_X509_EXT_SUBJECT_ALT_NAME:
/* Parse subject alt name */ /* Parse subject alt name */
if ((ret = x509_get_subject_alt_name(p, end_ext_octet, if ((ret = mbedtls_x509_get_subject_alt_name(p, end_ext_octet,
&crt->subject_alt_names)) != 0) { &crt->subject_alt_names)) != 0) {
return ret; return ret;
} }
@ -1053,7 +1053,7 @@ static int x509_get_crt_ext(unsigned char **p,
case MBEDTLS_X509_EXT_NS_CERT_TYPE: case MBEDTLS_X509_EXT_NS_CERT_TYPE:
/* Parse netscape certificate type */ /* Parse netscape certificate type */
if ((ret = x509_get_ns_cert_type(p, end_ext_octet, if ((ret = mbedtls_x509_get_ns_cert_type(p, end_ext_octet,
&crt->ns_cert_type)) != 0) { &crt->ns_cert_type)) != 0) {
return ret; return ret;
} }
@ -1849,7 +1849,7 @@ int mbedtls_x509_parse_subject_alt_name(const mbedtls_x509_buf *san_buf,
} }
#if !defined(MBEDTLS_X509_REMOVE_INFO) #if !defined(MBEDTLS_X509_REMOVE_INFO)
int x509_info_subject_alt_name(char **buf, size_t *size, int mbedtls_x509_info_subject_alt_name(char **buf, size_t *size,
const mbedtls_x509_sequence const mbedtls_x509_sequence
*subject_alt_name, *subject_alt_name,
const char *prefix) const char *prefix)
@ -1965,7 +1965,7 @@ int x509_info_subject_alt_name(char **buf, size_t *size,
if (ns_cert_type & (type)) \ if (ns_cert_type & (type)) \
PRINT_ITEM(name); PRINT_ITEM(name);
int x509_info_cert_type(char **buf, size_t *size, int mbedtls_x509_info_cert_type(char **buf, size_t *size,
unsigned char ns_cert_type) unsigned char ns_cert_type)
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
@ -1992,7 +1992,7 @@ int x509_info_cert_type(char **buf, size_t *size,
if (key_usage & (code)) \ if (key_usage & (code)) \
PRINT_ITEM(name); PRINT_ITEM(name);
int x509_info_key_usage(char **buf, size_t *size, int mbedtls_x509_info_key_usage(char **buf, size_t *size,
unsigned int key_usage) unsigned int key_usage)
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
@ -2167,7 +2167,7 @@ int mbedtls_x509_crt_info(char *buf, size_t size, const char *prefix,
ret = mbedtls_snprintf(p, n, "\n%ssubject alt name :", prefix); ret = mbedtls_snprintf(p, n, "\n%ssubject alt name :", prefix);
MBEDTLS_X509_SAFE_SNPRINTF; MBEDTLS_X509_SAFE_SNPRINTF;
if ((ret = x509_info_subject_alt_name(&p, &n, if ((ret = mbedtls_x509_info_subject_alt_name(&p, &n,
&crt->subject_alt_names, &crt->subject_alt_names,
prefix)) != 0) { prefix)) != 0) {
return ret; return ret;
@ -2178,7 +2178,7 @@ int mbedtls_x509_crt_info(char *buf, size_t size, const char *prefix,
ret = mbedtls_snprintf(p, n, "\n%scert. type : ", prefix); ret = mbedtls_snprintf(p, n, "\n%scert. type : ", prefix);
MBEDTLS_X509_SAFE_SNPRINTF; MBEDTLS_X509_SAFE_SNPRINTF;
if ((ret = x509_info_cert_type(&p, &n, crt->ns_cert_type)) != 0) { if ((ret = mbedtls_x509_info_cert_type(&p, &n, crt->ns_cert_type)) != 0) {
return ret; return ret;
} }
} }
@ -2187,7 +2187,7 @@ int mbedtls_x509_crt_info(char *buf, size_t size, const char *prefix,
ret = mbedtls_snprintf(p, n, "\n%skey usage : ", prefix); ret = mbedtls_snprintf(p, n, "\n%skey usage : ", prefix);
MBEDTLS_X509_SAFE_SNPRINTF; MBEDTLS_X509_SAFE_SNPRINTF;
if ((ret = x509_info_key_usage(&p, &n, crt->key_usage)) != 0) { if ((ret = mbedtls_x509_info_key_usage(&p, &n, crt->key_usage)) != 0) {
return ret; return ret;
} }
} }

12
library/x509_csr.c
View File

@ -127,7 +127,7 @@ static int x509_csr_parse_extensions(mbedtls_x509_csr *csr,
switch (ext_type) { switch (ext_type) {
case MBEDTLS_X509_EXT_KEY_USAGE: case MBEDTLS_X509_EXT_KEY_USAGE:
/* Parse key usage */ /* Parse key usage */
if ((ret = x509_get_key_usage(p, end_ext_data, if ((ret = mbedtls_x509_get_key_usage(p, end_ext_data,
&csr->key_usage)) != 0) { &csr->key_usage)) != 0) {
return ret; return ret;
} }
@ -135,7 +135,7 @@ static int x509_csr_parse_extensions(mbedtls_x509_csr *csr,
case MBEDTLS_X509_EXT_SUBJECT_ALT_NAME: case MBEDTLS_X509_EXT_SUBJECT_ALT_NAME:
/* Parse subject alt name */ /* Parse subject alt name */
if ((ret = x509_get_subject_alt_name(p, end_ext_data, if ((ret = mbedtls_x509_get_subject_alt_name(p, end_ext_data,
&csr->subject_alt_names)) != 0) { &csr->subject_alt_names)) != 0) {
return ret; return ret;
} }
@ -143,7 +143,7 @@ static int x509_csr_parse_extensions(mbedtls_x509_csr *csr,
case MBEDTLS_X509_EXT_NS_CERT_TYPE: case MBEDTLS_X509_EXT_NS_CERT_TYPE:
/* Parse netscape certificate type */ /* Parse netscape certificate type */
if ((ret = x509_get_ns_cert_type(p, end_ext_data, if ((ret = mbedtls_x509_get_ns_cert_type(p, end_ext_data,
&csr->ns_cert_type)) != 0) { &csr->ns_cert_type)) != 0) {
return ret; return ret;
} }
@ -517,7 +517,7 @@ int mbedtls_x509_csr_info(char *buf, size_t size, const char *prefix,
ret = mbedtls_snprintf(p, n, "\n%ssubject alt name :", prefix); ret = mbedtls_snprintf(p, n, "\n%ssubject alt name :", prefix);
MBEDTLS_X509_SAFE_SNPRINTF; MBEDTLS_X509_SAFE_SNPRINTF;
if ((ret = x509_info_subject_alt_name(&p, &n, if ((ret = mbedtls_x509_info_subject_alt_name(&p, &n,
&csr->subject_alt_names, &csr->subject_alt_names,
prefix)) != 0) { prefix)) != 0) {
return ret; return ret;
@ -528,7 +528,7 @@ int mbedtls_x509_csr_info(char *buf, size_t size, const char *prefix,
ret = mbedtls_snprintf(p, n, "\n%scert. type : ", prefix); ret = mbedtls_snprintf(p, n, "\n%scert. type : ", prefix);
MBEDTLS_X509_SAFE_SNPRINTF; MBEDTLS_X509_SAFE_SNPRINTF;
if ((ret = x509_info_cert_type(&p, &n, csr->ns_cert_type)) != 0) { if ((ret = mbedtls_x509_info_cert_type(&p, &n, csr->ns_cert_type)) != 0) {
return ret; return ret;
} }
} }
@ -537,7 +537,7 @@ int mbedtls_x509_csr_info(char *buf, size_t size, const char *prefix,
ret = mbedtls_snprintf(p, n, "\n%skey usage : ", prefix); ret = mbedtls_snprintf(p, n, "\n%skey usage : ", prefix);
MBEDTLS_X509_SAFE_SNPRINTF; MBEDTLS_X509_SAFE_SNPRINTF;
if ((ret = x509_info_key_usage(&p, &n, csr->key_usage)) != 0) { if ((ret = mbedtls_x509_info_key_usage(&p, &n, csr->key_usage)) != 0) {
return ret; return ret;
} }
} }