summaryrefslogtreecommitdiffstats
path: root/crypto/x509v3/v3_utl.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-11-21 14:10:48 +0000
committerDr. Stephen Henson <steve@openssl.org>2012-11-21 14:10:48 +0000
commit472af806ce859b6b00249550027c2c9fa149453b (patch)
tree64b57074bc7f5172899075c2f150614a40e8f63c /crypto/x509v3/v3_utl.c
parent5c1393bfc38946cb3696a10ce7bd9c2c1cd2a782 (diff)
Submitted by: Florian Weimer <fweimer@redhat.com>
PR: 2909 Update test cases to cover internal error return values. Remove IDNA wildcard filter.
Diffstat (limited to 'crypto/x509v3/v3_utl.c')
-rw-r--r--crypto/x509v3/v3_utl.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c
index ffd9f0d577..de43c2fb3b 100644
--- a/crypto/x509v3/v3_utl.c
+++ b/crypto/x509v3/v3_utl.c
@@ -719,12 +719,7 @@ static const unsigned char *wildcard_find_star(const unsigned char *pattern,
static int equal_wildcard(const unsigned char *pattern, size_t pattern_len,
const unsigned char *subject, size_t subject_len)
{
- const unsigned char *star;
- /* Do not match IDNA names. */
- if (subject_len >=4 && memcmp(subject, "xn--", 4) == 0)
- star = NULL;
- else
- star = wildcard_find_star(pattern, pattern_len);
+ const unsigned char *star = wildcard_find_star(pattern, pattern_len);
if (star == NULL)
return equal_nocase(pattern, pattern_len,
subject, subject_len);