mirrors
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Peer review feedback.

This commit is contained in:
David Garske 2022-01-28 09:21:01 -08:00
parent 6615f019f5
commit c69010adef
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ssl.c
View File

@ -31487,7 +31487,7 @@ void* wolfSSL_sk_value(const WOLFSSL_STACK* sk, int i)
case STACK_TYPE_X509_NAME: case STACK_TYPE_X509_NAME:
return (void*)sk->data.name; return (void*)sk->data.name;
case STACK_TYPE_X509_NAME_ENTRY: case STACK_TYPE_X509_NAME_ENTRY:
return (void*)sk->data.nameentry; return (void*)sk->data.name_entry;
case STACK_TYPE_CONF_VALUE: case STACK_TYPE_CONF_VALUE:
return (void*)sk->data.conf; return (void*)sk->data.conf;
case STACK_TYPE_X509_INFO: case STACK_TYPE_X509_INFO:
@ -48127,22 +48127,26 @@ WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* wolfSSL_sk_X509_NAME_ENTRY_new(
} }
return sk; return sk;
} }
int wolfSSL_sk_X509_NAME_ENTRY_push(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk, int wolfSSL_sk_X509_NAME_ENTRY_push(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk,
WOLFSSL_X509_NAME_ENTRY* nameentry) WOLFSSL_X509_NAME_ENTRY* name_entry)
{ {
return wolfSSL_sk_push(sk, nameentry); return wolfSSL_sk_push(sk, name_entry);
} }
WOLFSSL_X509_NAME_ENTRY* wolfSSL_sk_X509_NAME_ENTRY_value( WOLFSSL_X509_NAME_ENTRY* wolfSSL_sk_X509_NAME_ENTRY_value(
const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk, int i) const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk, int i)
{ {
return (WOLFSSL_X509_NAME_ENTRY*)wolfSSL_sk_value(sk, i); return (WOLFSSL_X509_NAME_ENTRY*)wolfSSL_sk_value(sk, i);
} }
int wolfSSL_sk_X509_NAME_ENTRY_num(const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk) int wolfSSL_sk_X509_NAME_ENTRY_num(const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk)
{ {
if (sk == NULL) if (sk == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return (int)sk->num; return (int)sk->num;
} }
void wolfSSL_sk_X509_NAME_ENTRY_free(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk) void wolfSSL_sk_X509_NAME_ENTRY_free(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk)
{ {
wolfSSL_sk_free(sk); wolfSSL_sk_free(sk);

2
wolfssl/internal.h
View File

@ -3861,7 +3861,7 @@ struct WOLFSSL_STACK {
union { union {
WOLFSSL_X509* x509; WOLFSSL_X509* x509;
WOLFSSL_X509_NAME* name; WOLFSSL_X509_NAME* name;
WOLFSSL_X509_NAME_ENTRY* nameentry; WOLFSSL_X509_NAME_ENTRY* name_entry;
WOLFSSL_X509_INFO* info; WOLFSSL_X509_INFO* info;
WOLFSSL_BIO* bio; WOLFSSL_BIO* bio;
WOLFSSL_ASN1_OBJECT* obj; WOLFSSL_ASN1_OBJECT* obj;

12
wolfssl/ssl.h
View File

@ -4383,13 +4383,13 @@ WOLFSSL_API void wolfSSL_sk_X509_NAME_pop_free(WOLF_STACK_OF(WOLFSSL_X509_NAME)*
WOLFSSL_API void wolfSSL_sk_X509_NAME_free(WOLF_STACK_OF(WOLFSSL_X509_NAME) *); WOLFSSL_API void wolfSSL_sk_X509_NAME_free(WOLF_STACK_OF(WOLFSSL_X509_NAME) *);
WOLFSSL_API WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* WOLFSSL_API WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)*
wolfSSL_sk_X509_NAME_ENTRY_new(wolf_sk_compare_cb); wolfSSL_sk_X509_NAME_ENTRY_new(wolf_sk_compare_cb cb);
WOLFSSL_API int wolfSSL_sk_X509_NAME_ENTRY_push(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)*, WOLFSSL_API int wolfSSL_sk_X509_NAME_ENTRY_push(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk,
WOLFSSL_X509_NAME_ENTRY*); WOLFSSL_X509_NAME_ENTRY* name_entry);
WOLFSSL_API WOLFSSL_X509_NAME_ENTRY* WOLFSSL_API WOLFSSL_X509_NAME_ENTRY*
wolfSSL_sk_X509_NAME_ENTRY_value(const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)*, int); wolfSSL_sk_X509_NAME_ENTRY_value(const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk, int i);
WOLFSSL_API int wolfSSL_sk_X509_NAME_ENTRY_num(const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)*); WOLFSSL_API int wolfSSL_sk_X509_NAME_ENTRY_num(const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk);
WOLFSSL_API void wolfSSL_sk_X509_NAME_ENTRY_free(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY) *); WOLFSSL_API void wolfSSL_sk_X509_NAME_ENTRY_free(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk);
WOLFSSL_API int wolfSSL_sk_X509_OBJECT_num(const WOLF_STACK_OF(WOLFSSL_X509_OBJECT) *s); WOLFSSL_API int wolfSSL_sk_X509_OBJECT_num(const WOLF_STACK_OF(WOLFSSL_X509_OBJECT) *s);