wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

add comments and description to new function and API

Browse Source
This commit is contained in:
Hideki Miyazaki
2021-03-06 19:28:25 +09:00
parent 39b0c4eaf8
commit e73b06e797
3 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/internal.c
View File

@@ -10576,8 +10576,12 @@ static void FreeProcPeerCertArgs(WOLFSSL* ssl, void* pArgs)
#if defined(OPENSSL_ALL) && defined(WOLFSSL_CERT_GEN) && \ #if defined(OPENSSL_ALL) && defined(WOLFSSL_CERT_GEN) && \
(defined(WOLFSSL_CERT_REQ) || defined(OLFSSL_CERT_EXT)) && \ (defined(WOLFSSL_CERT_REQ) || defined(OLFSSL_CERT_EXT)) && \
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR) !defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR)
/* load certificate file which has <hash>.(r)N[0..N] in the folder */ /* load certificate file which has the form <hash>.(r)N[0..N] */
/* in the folder. */
/* (r), in the case of CRL file */ /* (r), in the case of CRL file */
/* @param store a pointer to X509_STORE structure */
/* @param issuer a pointer to X509_NAME that presents issuer */
/* @param type X509_LU_X509 or X509_LU_CRL */
int LoadCrlCertByIssuer(WOLFSSL_X509_STORE* store, X509_NAME* issuer, int type) int LoadCrlCertByIssuer(WOLFSSL_X509_STORE* store, X509_NAME* issuer, int type)
{ {
const int MAX_SUFFIX = 10; const int MAX_SUFFIX = 10;
@@ -10599,8 +10603,8 @@ int LoadCrlCertByIssuer(WOLFSSL_X509_STORE* store, X509_NAME* issuer, int type)
WOLFSSL_ENTER("LoadCrlCertByIssuer"); WOLFSSL_ENTER("LoadCrlCertByIssuer");
/* sanity check */ /* sanity check */
if (store == NULL || lookup->dirs == NULL || lookup->type != 1 if (store == NULL || issuer == NULL || lookup->dirs == NULL ||
|| (type != X509_LU_X509 && type != X509_LU_CRL)) { lookup->type != 1 || (type != X509_LU_X509 && type != X509_LU_CRL)) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }

43
src/ssl.c
View File

@@ -26492,9 +26492,6 @@ WOLFSSL_API int wolfSSL_X509_load_crl_file(WOLFSSL_X509_LOOKUP *ctx,
WOLFSSL_LEAVE("wolfSSL_X509_load_crl_file", ret); WOLFSSL_LEAVE("wolfSSL_X509_load_crl_file", ret);
return ret; return ret;
} }
#endif /* !NO_FILESYSTEM */ #endif /* !NO_FILESYSTEM */
@@ -41614,12 +41611,16 @@ static int wolfSSL_ASN1_STRING_canon(WOLFSSL_ASN1_STRING* asn_out,
asn_out->length = (int)(dst - asn_out->data); asn_out->length = (int)(dst - asn_out->data);
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
/* this is to converts the x509 name structure into canonical DER format /* this is to converts the x509 name structure into canonical DER format
* , which has the following rules: * , which has the following rules:
* convert to UTF8 * convert to UTF8
* convert to lower case * convert to lower case
* multi-spaces collapsed * multi-spaces collapsed
* leading SEQUENCE hader is skipped * leading SEQUENCE hader is skipped
* @param name a pointer to X509_NAME that is to be converted
* @param out a pointer to conveted data
* @return a number of converted bytes, otherwise <0 error code
*/ */
int wolfSSL_i2d_X509_NAME_canon(WOLFSSL_X509_NAME* name, unsigned char** out) int wolfSSL_i2d_X509_NAME_canon(WOLFSSL_X509_NAME* name, unsigned char** out)
{ {
@@ -46301,7 +46302,7 @@ void wolfSSL_sk_SSL_CIPHER_free(WOLF_STACK_OF(WOLFSSL_CIPHER)* sk)
} }
#if defined(OPENSSL_ALL) && !defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR) #if defined(OPENSSL_ALL) && !defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR)
/* WOLFSSL_BY_DIR_HASH stuff */ /* create an instance of WOLFSSL_BY_DIR_HASH structure */
WOLFSSL_BY_DIR_HASH* wolfSSL_BY_DIR_HASH_new(void) WOLFSSL_BY_DIR_HASH* wolfSSL_BY_DIR_HASH_new(void)
{ {
WOLFSSL_BY_DIR_HASH* dir_hash; WOLFSSL_BY_DIR_HASH* dir_hash;
@@ -46315,7 +46316,7 @@ WOLFSSL_BY_DIR_HASH* wolfSSL_BY_DIR_HASH_new(void)
} }
return dir_hash; return dir_hash;
} }
/* release a WOLFSSL_BY_DIR_HASH resource */
void wolfSSL_BY_DIR_HASH_free(WOLFSSL_BY_DIR_HASH* dir_hash) void wolfSSL_BY_DIR_HASH_free(WOLFSSL_BY_DIR_HASH* dir_hash)
{ {
if (dir_hash == NULL) if (dir_hash == NULL)
@@ -46323,7 +46324,7 @@ void wolfSSL_BY_DIR_HASH_free(WOLFSSL_BY_DIR_HASH* dir_hash)
XFREE(dir_hash, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(dir_hash, NULL, DYNAMIC_TYPE_OPENSSL);
} }
/* create an instance of WOLFSSL_STACK for STACK_TYPE_BY_DIR_hash */
WOLFSSL_STACK* wolfSSL_sk_BY_DIR_HASH_new_null(void) WOLFSSL_STACK* wolfSSL_sk_BY_DIR_HASH_new_null(void)
{ {
WOLFSSL_STACK* sk = wolfSSL_sk_new_node(NULL); WOLFSSL_STACK* sk = wolfSSL_sk_new_node(NULL);
@@ -46361,7 +46362,7 @@ int wolfSSL_sk_BY_DIR_HASH_find(
} }
return -1; return -1;
} }
/* return a number of WOLFSSL_BY_DIR_HASH in stack */
int wolfSSL_sk_BY_DIR_HASH_num(const WOLF_STACK_OF(WOLFSSL_BY_DIR_HASH) *sk) int wolfSSL_sk_BY_DIR_HASH_num(const WOLF_STACK_OF(WOLFSSL_BY_DIR_HASH) *sk)
{ {
WOLFSSL_ENTER("wolfSSL_sk_WOLFSSL_BY_DIR_HASH_num"); WOLFSSL_ENTER("wolfSSL_sk_WOLFSSL_BY_DIR_HASH_num");
@@ -46370,7 +46371,7 @@ int wolfSSL_sk_BY_DIR_HASH_num(const WOLF_STACK_OF(WOLFSSL_BY_DIR_HASH) *sk)
return -1; return -1;
return (int)sk->num; return (int)sk->num;
} }
/* return WOLFSSL_BY_DIR_HASH instance at i */
WOLFSSL_BY_DIR_HASH* wolfSSL_sk_BY_DIR_HASH_value( WOLFSSL_BY_DIR_HASH* wolfSSL_sk_BY_DIR_HASH_value(
const WOLF_STACK_OF(WOLFSSL_BY_DIR_HASH) *sk, int i) const WOLF_STACK_OF(WOLFSSL_BY_DIR_HASH) *sk, int i)
{ {
@@ -46383,7 +46384,7 @@ WOLFSSL_BY_DIR_HASH* wolfSSL_sk_BY_DIR_HASH_value(
return NULL; return NULL;
return sk->data.dir_hash; return sk->data.dir_hash;
} }
/* pop WOLFSSL_BY_DIR_HASH instance, and remove its node from stack */
WOLFSSL_BY_DIR_HASH* wolfSSL_sk_BY_DIR_HASH_pop( WOLFSSL_BY_DIR_HASH* wolfSSL_sk_BY_DIR_HASH_pop(
WOLF_STACK_OF(WOLFSSL_BY_DIR_HASH)* sk) WOLF_STACK_OF(WOLFSSL_BY_DIR_HASH)* sk)
{ {
@@ -46414,7 +46415,8 @@ WOLFSSL_BY_DIR_HASH* wolfSSL_sk_BY_DIR_HASH_pop(
return hash; return hash;
} }
/* release all contents in stack, and then release stack itself */
/* it uses function when it is passed */
void wolfSSL_sk_BY_DIR_HASH_pop_free(WOLF_STACK_OF(BY_DIR_HASH)* sk, void wolfSSL_sk_BY_DIR_HASH_pop_free(WOLF_STACK_OF(BY_DIR_HASH)* sk,
void (*f) (WOLFSSL_BY_DIR_HASH*)) void (*f) (WOLFSSL_BY_DIR_HASH*))
{ {
@@ -46451,13 +46453,11 @@ void wolfSSL_sk_BY_DIR_HASH_pop_free(WOLF_STACK_OF(BY_DIR_HASH)* sk,
} }
XFREE(sk, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(sk, NULL, DYNAMIC_TYPE_OPENSSL);
} }
/* release all contents in stack, and then release stack itself */
void wolfSSL_sk_BY_DIR_HASH_free(WOLF_STACK_OF(WOLFSSL_BY_DIR_HASH) *sk) void wolfSSL_sk_BY_DIR_HASH_free(WOLF_STACK_OF(WOLFSSL_BY_DIR_HASH) *sk)
{ {
wolfSSL_sk_BY_DIR_HASH_pop_free(sk, NULL); wolfSSL_sk_BY_DIR_HASH_pop_free(sk, NULL);
} }
/* Adds the WOLFSSL_BY_DIR_HASH to the stack "sk". "sk" takes control of "in" and /* Adds the WOLFSSL_BY_DIR_HASH to the stack "sk". "sk" takes control of "in" and
* tries to free it when the stack is free'd. * tries to free it when the stack is free'd.
* *
@@ -46500,9 +46500,7 @@ int wolfSSL_sk_BY_DIR_HASH_push(WOLF_STACK_OF(WOLFSSL_BY_DIR_HASH)* sk,
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
/* create an instance of WOLFSSL_BY_DIR_entry structure */
/* WOLFSSL_BY_DIR_entry stuff */
WOLFSSL_BY_DIR_entry* wolfSSL_BY_DIR_entry_new(void) WOLFSSL_BY_DIR_entry* wolfSSL_BY_DIR_entry_new(void)
{ {
WOLFSSL_BY_DIR_entry* entry; WOLFSSL_BY_DIR_entry* entry;
@@ -46517,7 +46515,7 @@ WOLFSSL_BY_DIR_entry* wolfSSL_BY_DIR_entry_new(void)
} }
return entry; return entry;
} }
/* release a WOLFSSL_BY_DIR_entry resource */
void wolfSSL_BY_DIR_entry_free(WOLFSSL_BY_DIR_entry* entry) void wolfSSL_BY_DIR_entry_free(WOLFSSL_BY_DIR_entry* entry)
{ {
WOLFSSL_ENTER("wolfSSL_BY_DIR_entry_free"); WOLFSSL_ENTER("wolfSSL_BY_DIR_entry_free");
@@ -46547,7 +46545,7 @@ WOLFSSL_STACK* wolfSSL_sk_BY_DIR_entry_new_null(void)
} }
return sk; return sk;
} }
/* return a number of WOLFSSL_BY_DIR_entry in stack */
int wolfSSL_sk_BY_DIR_entry_num(const WOLF_STACK_OF(WOLFSSL_BY_DIR_entry) *sk) int wolfSSL_sk_BY_DIR_entry_num(const WOLF_STACK_OF(WOLFSSL_BY_DIR_entry) *sk)
{ {
WOLFSSL_ENTER("wolfSSL_sk_BY_DIR_entry_num"); WOLFSSL_ENTER("wolfSSL_sk_BY_DIR_entry_num");
@@ -46556,7 +46554,7 @@ int wolfSSL_sk_BY_DIR_entry_num(const WOLF_STACK_OF(WOLFSSL_BY_DIR_entry) *sk)
return -1; return -1;
return (int)sk->num; return (int)sk->num;
} }
/* return WOLFSSL_BY_DIR_entry instance at i */
WOLFSSL_BY_DIR_entry* wolfSSL_sk_BY_DIR_entry_value( WOLFSSL_BY_DIR_entry* wolfSSL_sk_BY_DIR_entry_value(
const WOLF_STACK_OF(WOLFSSL_BY_DIR_entry) *sk, int i) const WOLF_STACK_OF(WOLFSSL_BY_DIR_entry) *sk, int i)
{ {
@@ -46569,7 +46567,7 @@ WOLFSSL_BY_DIR_entry* wolfSSL_sk_BY_DIR_entry_value(
return NULL; return NULL;
return sk->data.dir_entry; return sk->data.dir_entry;
} }
/* pop WOLFSSL_BY_DIR_entry instance first, and remove its node from stack */
WOLFSSL_BY_DIR_entry* wolfSSL_sk_BY_DIR_entry_pop( WOLFSSL_BY_DIR_entry* wolfSSL_sk_BY_DIR_entry_pop(
WOLF_STACK_OF(WOLFSSL_BY_DIR_entry)* sk) WOLF_STACK_OF(WOLFSSL_BY_DIR_entry)* sk)
{ {
@@ -46600,7 +46598,8 @@ WOLFSSL_BY_DIR_entry* wolfSSL_sk_BY_DIR_entry_pop(
return entry; return entry;
} }
/* release all contents in stack, and then release stack itself */
/* it uses function when it is passed */
void wolfSSL_sk_BY_DIR_entry_pop_free(WOLF_STACK_OF(WOLFSSL_BY_DIR_entry)* sk, void wolfSSL_sk_BY_DIR_entry_pop_free(WOLF_STACK_OF(WOLFSSL_BY_DIR_entry)* sk,
void (*f) (WOLFSSL_BY_DIR_entry*)) void (*f) (WOLFSSL_BY_DIR_entry*))
{ {
@@ -46637,7 +46636,7 @@ void wolfSSL_sk_BY_DIR_entry_pop_free(WOLF_STACK_OF(WOLFSSL_BY_DIR_entry)* sk,
} }
XFREE(sk, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(sk, NULL, DYNAMIC_TYPE_OPENSSL);
} }
/* release all contents in stack, and then release stack itself */
void wolfSSL_sk_BY_DIR_entry_free(WOLF_STACK_OF(wolfSSL_BY_DIR_entry) *sk) void wolfSSL_sk_BY_DIR_entry_free(WOLF_STACK_OF(wolfSSL_BY_DIR_entry) *sk)
{ {
wolfSSL_sk_BY_DIR_entry_pop_free(sk, NULL); wolfSSL_sk_BY_DIR_entry_pop_free(sk, NULL);

5
wolfcrypt/src/asn.c
View File

@@ -9791,6 +9791,7 @@ int ParseCertRelative(DecodedCert* cert, int type, int verify, void* cm)
} }
} }
#endif #endif
if (cert->srcIdx < cert->sigIndex) { if (cert->srcIdx < cert->sigIndex) {
#ifndef ALLOW_V1_EXTENSIONS #ifndef ALLOW_V1_EXTENSIONS
if (cert->version < 2) { if (cert->version < 2) {
@@ -9819,6 +9820,7 @@ int ParseCertRelative(DecodedCert* cert, int type, int verify, void* cm)
/* advance past extensions */ /* advance past extensions */
cert->srcIdx = cert->sigIndex; cert->srcIdx = cert->sigIndex;
} }
if ((ret = GetAlgoId(cert->source, &cert->srcIdx, if ((ret = GetAlgoId(cert->source, &cert->srcIdx,
#ifdef WOLFSSL_CERT_REQ #ifdef WOLFSSL_CERT_REQ
!cert->isCSR ? &confirmOID : &cert->signatureOID, !cert->isCSR ? &confirmOID : &cert->signatureOID,
@@ -13169,7 +13171,6 @@ int wc_EncodeName(EncodedName* name, const char* nameStr, char nameType,
return idx; return idx;
} }
/* /*
* this wrappes wc_EncodeName for EMAIL OID * this wrappes wc_EncodeName for EMAIL OID
*/ */
@@ -13248,8 +13249,6 @@ int wc_EncodeName_cano(EncodedName* name, const char* nameStr, char nameType,
return idx; return idx;
} }
/* encode CertName into output, return total bytes written */ /* encode CertName into output, return total bytes written */
int SetName(byte* output, word32 outputSz, CertName* name) int SetName(byte* output, word32 outputSz, CertName* name)
{ {