feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Minor changes requested from review

Browse Source
This commit is contained in:
Carie Pointer
2019-10-09 15:38:26 -07:00
parent d137cab427
commit 4fa2b71848
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ssl.c
View File

@ -40565,10 +40565,10 @@ void wolfSSL_sk_X509_NAME_free(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk)
XFREE(sk, sk->heap, DYNAMIC_TYPE_OPENSSL); XFREE(sk, sk->heap, DYNAMIC_TYPE_OPENSSL);
} }
#if defined(WOLFSSL_APACHE_HTTPD) #if defined(WOLFSSL_APACHE_HTTPD) || defined(OPENSSL_ALL)
/* Helper function for X509_NAME_print_ex. Sets *buf to string for domain /* Helper function for X509_NAME_print_ex. Sets *buf to string for domain
name attribute based on NID. Returns size of buf */ name attribute based on NID. Returns size of buf */
int get_dn_attr_by_nid(int n, char** buf) static int get_dn_attr_by_nid(int n, char** buf)
{ {
int len = 0; int len = 0;
const char *str; const char *str;
@ -40617,7 +40617,7 @@ int get_dn_attr_by_nid(int n, char** buf)
int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name, int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
int indent, unsigned long flags) int indent, unsigned long flags)
{ {
#if defined(WOLFSSL_APACHE_HTTPD) #if defined(WOLFSSL_APACHE_HTTPD) || defined(OPENSSL_ALL)
int count = 0, len = 0, totalSz = 0, tmpSz = 0; int count = 0, len = 0, totalSz = 0, tmpSz = 0;
char tmp[ASN_NAME_MAX]; char tmp[ASN_NAME_MAX];
char fullName[ASN_NAME_MAX]; char fullName[ASN_NAME_MAX];
@ -40636,7 +40636,7 @@ int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
/* If XN_FLAG_DN_REV is present, print X509_NAME in reverse order */ /* If XN_FLAG_DN_REV is present, print X509_NAME in reverse order */
if (flags == (XN_FLAG_RFC2253 & ~XN_FLAG_DN_REV)) { if (flags == (XN_FLAG_RFC2253 & ~XN_FLAG_DN_REV)) {
#if defined(WOLFSSL_APACHE_HTTPD) #if defined(WOLFSSL_APACHE_HTTPD) || defined(OPENSSL_ALL)
fullName[0] = '\0'; fullName[0] = '\0';
count = wolfSSL_X509_NAME_entry_count(name); count = wolfSSL_X509_NAME_entry_count(name);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
@ -40652,7 +40652,7 @@ int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
if (len == 0 || buf == NULL) if (len == 0 || buf == NULL)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
tmpSz = str->length + len + 2; tmpSz = str->length + len + 2; /* + 2 for '=' and null char */
if (i < count - 1) { if (i < count - 1) {
XSNPRINTF(tmp, tmpSz+1, "%s=%s,", buf, str->data); XSNPRINTF(tmp, tmpSz+1, "%s=%s,", buf, str->data);
XSTRNCAT(fullName, tmp, tmpSz); XSTRNCAT(fullName, tmp, tmpSz);
@ -40666,7 +40666,7 @@ int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
if (wolfSSL_BIO_write(bio, fullName, totalSz) != totalSz) if (wolfSSL_BIO_write(bio, fullName, totalSz) != totalSz)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
#endif #endif /* WOLFSSL_APACHE_HTTPD || OPENSSL_ALL */
} }
else if (flags == XN_FLAG_RFC2253) { else if (flags == XN_FLAG_RFC2253) {
if (wolfSSL_BIO_write(bio, name->name + 1, name->sz - 2) if (wolfSSL_BIO_write(bio, name->name + 1, name->sz - 2)

3
wolfssl/ssl.h
View File

@ -3347,9 +3347,6 @@ WOLFSSL_API void wolfSSL_sk_X509_NAME_pop_free(WOLF_STACK_OF(WOLFSSL_X509_NAME)*
void f (WOLFSSL_X509_NAME*)); void f (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) *);
#if defined(WOLFSSL_APACHE_HTTPD)
WOLFSSL_API int get_dn_attr_by_nid(int n, char** buf);
#endif
WOLFSSL_API int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO*,WOLFSSL_X509_NAME*,int, WOLFSSL_API int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO*,WOLFSSL_X509_NAME*,int,
unsigned long); unsigned long);