wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 03:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3488 from kabuobeid/x509_objtxt_lname

Browse Source 
Return long names instead of short names in wolfSSL_OBJ_obj2txt().
This commit is contained in:
toddouska
2020-11-18 16:10:46 -08:00
committed by GitHub
parent 6860d419c6 da06ef8c3f
commit a280df1892
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ssl.c
View File

@@ -39365,15 +39365,21 @@ err:
}
}
else { /* return short name */
if (XSTRLEN(a->sName) + 1 < (word32)bufLen - 1) {
bufSz = (int)XSTRLEN(a->sName);
else { /* return long name unless using x509small, then return short name */
#if defined(OPENSSL_EXTRA_X509_SMALL) && !defined(OPENSSL_EXTRA)
const char* name = a->sName;
#else
const char* name = wolfSSL_OBJ_nid2ln(wolfSSL_OBJ_obj2nid(a));
#endif
if (XSTRLEN(name) + 1 < (word32)bufLen - 1) {
bufSz = (int)XSTRLEN(name);
}
else {
bufSz = bufLen - 1;
}
if (bufSz) {
XMEMCPY(buf, a->sName, bufSz);
XMEMCPY(buf, name, bufSz);
}
else if (wolfSSL_OBJ_obj2txt(buf, bufLen, a, 1)) {
if ((desc = oid_translate_num_to_str(buf))) {