github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-01-19 16:50:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some mixed declarations-and-code.

Browse Source
This commit is contained in:
Micah Cowan 2010-01-13 20:41:15 -08:00
parent 7585b7019d
commit 30b24240ae
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2010-01-13 Micah Cowan <micah@cowan.name>
* openssl.c: Fixed some mixed declarations-and-code.
2010-01-09 Micah Cowan <micah@cowan.name> 2010-01-09 Micah Cowan <micah@cowan.name>
* init.c, main.c, http.c, ftp.c, options.h: Renamed * init.c, main.c, http.c, ftp.c, options.h: Renamed

9
src/openssl.c
View File

@ -576,8 +576,7 @@ ssl_check_certificate (int fd, const char *host)
/* Do we want to check for dNSNAmes or ipAddresses (see RFC 2818)? /* Do we want to check for dNSNAmes or ipAddresses (see RFC 2818)?
* Signal it by host_in_octet_string. */ * Signal it by host_in_octet_string. */
ASN1_OCTET_STRING *host_in_octet_string = NULL; ASN1_OCTET_STRING *host_in_octet_string = a2i_IPADDRESS (host);
host_in_octet_string = a2i_IPADDRESS (host);
int numaltnames = sk_GENERAL_NAME_num (subjectAltNames); int numaltnames = sk_GENERAL_NAME_num (subjectAltNames);
int i; int i;
@ -602,11 +601,13 @@ ssl_check_certificate (int fd, const char *host)
} }
else if (name->type == GEN_DNS) else if (name->type == GEN_DNS)
{ {
/* Check for dNSName */
alt_name_checked = true;
/* dNSName should be IA5String (i.e. ASCII), however who /* dNSName should be IA5String (i.e. ASCII), however who
* does trust CA? Convert it into UTF-8 for sure. */ * does trust CA? Convert it into UTF-8 for sure. */
unsigned char *name_in_utf8 = NULL; unsigned char *name_in_utf8 = NULL;
/* Check for dNSName */
alt_name_checked = true;
if (0 <= ASN1_STRING_to_UTF8 (&name_in_utf8, name->d.dNSName)) if (0 <= ASN1_STRING_to_UTF8 (&name_in_utf8, name->d.dNSName))
{ {
/* Compare and check for NULL attack in ASN1_STRING */ /* Compare and check for NULL attack in ASN1_STRING */