From 8792301846f444d487f907f7613345eda7a67745 Mon Sep 17 00:00:00 2001 From: neocogent Date: Fri, 17 Jul 2015 10:48:28 +0700 Subject: [PATCH] restrict to *. only, add DN support also --- lib/interface.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/interface.py b/lib/interface.py index 07d66e1bf..06b8ecf3a 100644 --- a/lib/interface.py +++ b/lib/interface.py @@ -128,7 +128,7 @@ class TcpInterface(threading.Thread): return False if peercert.has_key("subjectAltName"): for typ, val in peercert["subjectAltName"]: - if typ == "DNS" and (val == name or (val[0] == '*' and name.find(val[1:]) + len(val[1:]) == len(name))): + if typ == "DNS" and (val == name or (val.find('*.') == 0 and name.find(val[1:]) + len(val[1:]) == len(name))): return True else: # Only check the subject DN if there is no subject alternative @@ -139,7 +139,7 @@ class TcpInterface(threading.Thread): if attr == "commonName": cn = val if cn is not None: - return cn == name + return (cn == name or (cn.find('*.') == 0 and name.find(cn[1:]) + len(cn[1:]) == len(name))) return False