Browse code

Improvised pyopenssl ipaddress certificate validation patch

Change-Id: Ic1bacbce072de34ba97f6bf76b10ab1ec78a4c37
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1387
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>
Tested-by: Divya Thaluru <dthaluru@vmware.com>
(cherry picked from commit d0453118285e23aeac3e3eca4af7deba2229bc1e)
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1388

dthaluru authored on 2016/09/15 07:54:33
Showing 2 changed files
... ...
@@ -43,8 +43,7 @@
43 43
      san = cert.get('subjectAltName', ())
44 44
      for key, value in san:
45 45
          if key == 'DNS':
46
--            if _dnsname_match(value, hostname):
47
-+            if host_ip is None and _dnsname_match(value, hostname):
46
+             if _dnsname_match(value, hostname):
48 47
                  return
49 48
              dnsnames.append(value)
50 49
 +        elif key == 'IP Address':
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	A high-level scripting language
2 2
 Name:		python2
3 3
 Version:	2.7.11
4
-Release:	6%{?dist}
4
+Release:	7%{?dist}
5 5
 License:	PSF
6 6
 URL:		http://www.python.org/
7 7
 Group:		System Environment/Programming
... ...
@@ -217,6 +217,8 @@ rm -rf %{buildroot}/*
217 217
 %{_bindir}/idle*
218 218
 
219 219
 %changelog
220
+*   Wed Sep 14 2016 Divya Thaluru <dthaluru@vmware.com> 2.7.11-7
221
+-   Improvised pyopenssl patch
220 222
 *   Wed Sep 7 2016 Divya Thaluru <dthaluru@vmware.com> 2.7.11-6
221 223
 -   Added patch to python openssl to validate certificates by ipaddress 
222 224
 *   Mon Jun 20 2016 Divya Thaluru <dthaluru@vmware.com> 2.7.11-5