storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #193 from rkta/asn1_string_manipulation

Browse Source 
Fix manipulation of ASN1_STRING
This commit is contained in:
Tatsuya Kinoshita
2021-09-18 20:52:37 +09:00
committed by GitHub
parent 456ec66be8 cab914ef48
commit b8a443130c
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
istream.c
View File

@@ -422,25 +422,36 @@ ssl_check_cert_ident(X509 * x, char *hostname)
gn = sk_GENERAL_NAME_value(alt, i); gn = sk_GENERAL_NAME_value(alt, i);
if (gn->type == GEN_DNS) { if (gn->type == GEN_DNS) {
#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
char *sn = ASN1_STRING_data(gn->d.ia5); unsigned char *sn = ASN1_STRING_data(gn->d.ia5);
#else #else
char *sn = ASN1_STRING_get0_data(gn->d.ia5); const unsigned char *sn = ASN1_STRING_get0_data(gn->d.ia5);
#endif #endif
int sl = ASN1_STRING_length(gn->d.ia5); int sl = ASN1_STRING_length(gn->d.ia5);
/*
* sn is a pointer to internal data and not guaranteed to
* be null terminated. Ensure we have a null terminated
* string that we can modify.
*/
char *asn = GC_MALLOC(sl + 1);
if (!asn)
exit(1);
bcopy(sn, asn, sl);
asn[sl] = '\0';
if (!seen_dnsname) if (!seen_dnsname)
seen_dnsname = Strnew(); seen_dnsname = Strnew();
/* replace \0 to make full string visible to user */ /* replace \0 to make full string visible to user */
if (sl != strlen(sn)) { if (sl != strlen(asn)) {
int i; int i;
for (i = 0; i < sl; ++i) { for (i = 0; i < sl; ++i) {
if (!sn[i]) if (!asn[i])
sn[i] = '!'; asn[i] = '!';
} }
} }
Strcat_m_charp(seen_dnsname, sn, " ", NULL); Strcat_m_charp(seen_dnsname, asn, " ", NULL);
if (sl == strlen(sn) /* catch \0 in SAN */ if (sl == strlen(asn) /* catch \0 in SAN */
&& ssl_match_cert_ident(sn, sl, hostname)) && ssl_match_cert_ident(asn, sl, hostname))
break; break;
} }
} }