rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
spacewalk/certs-tools/sslToolConfig.py | 14 +++++++-------
3 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 9d085cd94d08fdb7909fe4db31deb812787f7fe3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Aug 24 17:17:48 2011 +0200
Automatic commit of package [spacewalk-certs-tools] release [1.6.4-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools
b/rel-eng/packages/spacewalk-certs-tools
index 819692d..7b5a192 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.6.3-1 spacewalk/certs-tools/
+1.6.4-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec
b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index b152c2e..cb8e9c2 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.6.3
+Version: 1.6.4
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Wed Aug 24 2011 Miroslav Suchý 1.6.4-1
+- if subjectAltName is used, hostname must be present in dNSName
+
* Tue Aug 23 2011 Miroslav Suchý 1.6.3-1
- do not fail if --set-cname is not specified
commit e10afa85d8b7baa231daf3a8ce421abdbd1e1adb
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Aug 24 17:15:02 2011 +0200
if subjectAltName is used, hostname must be present in dNSName
see:
ftp://ftp.rfc-editor.org/in-notes/rfc2459.txt
chapter 4.2.1.7 paragraph 5
and
ftp://ftp.rfc-editor.org/in-notes/rfc2818.txt
chapter 3.1 paragraph 3
addressing:
Traceback (most recent call last):
File "/usr/bin/yum", line 29, in ?
yummain.user_main(sys.argv[1:], exit_code=True)
File "/usr/share/yum-cli/yummain.py", line 309, in user_main
errcode = main(args)
File "/usr/share/yum-cli/yummain.py", line 178, in main
result, resultmsgs = base.doCommands()
File "/usr/share/yum-cli/cli.py", line 349, in doCommands
return self.yum_cli_commands[self.basecmd].doCommand(self, self.basecmd,
self.extcmds)
File "/usr/share/yum-cli/yumcommands.py", line 788, in doCommand
base.repos.populateSack()
File "/usr/lib/python2.4/site-packages/yum/repos.py", line 260, in
populateSack
sack.populate(repo, mdtype, callback, cacheonly)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 168, in
populate
if self._check_db_version(repo, mydbtype):
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 226, in
_check_db_version
return repo._check_db_version(mdtype)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1226, in
_check_db_version
repoXML = self.repoXML
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1399, in
<lambda>
repoXML = property(fget=lambda self: self._getRepoXML(),
File "/usr/share/yum-plugins/rhnplugin.py", line 520, in _getRepoXML
return YumRepository._getRepoXML(self)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1391, in
_getRepoXML
self._loadRepoXML(text=self)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1381, in
_loadRepoXML
return self._groupLoadRepoXML(text, ["primary"])
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1365, in
_groupLoadRepoXML
if self._commonLoadRepoXML(text):
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1201, in
_commonLoadRepoXML
result = self._getFileRepoXML(local, text)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 974, in
_getFileRepoXML
cache=self.http_caching == 'all')
File "/usr/share/yum-plugins/rhnplugin.py", line 334, in _getFile
start, end, copy_local, checkfunc, text, reget, cache, size)
File "/usr/share/yum-plugins/rhnplugin.py", line 436, in
_noExceptionWrappingGet
size = size
File "/usr/lib/python2.4/site-packages/urlgrabber/grabber.py", line 936,
in urlgrab
return self._retry(opts, retryfunc, url, filename)
File "/usr/lib/python2.4/site-packages/urlgrabber/grabber.py", line 854,
in _retry
r = apply(func, (opts,) + args, {})
File "/usr/lib/python2.4/site-packages/urlgrabber/grabber.py", line 922,
in retryfunc
fo = URLGrabberFileObject(url, filename, opts)
File "/usr/lib/python2.4/site-packages/urlgrabber/grabber.py", line 1010,
in __init__
self._do_open()
File "/usr/lib/python2.4/site-packages/urlgrabber/grabber.py", line 1093,
in _do_open
fo, hdr = self._make_request(req, opener)
File "/usr/lib/python2.4/site-packages/urlgrabber/grabber.py", line 1202,
in _make_request
fo = opener.open(req)
File "/usr/lib/python2.4/urllib2.py", line 358, in open
response = self._open(req, data)
File "/usr/lib/python2.4/urllib2.py", line 376, in _open
'_open', req)
File "/usr/lib/python2.4/urllib2.py", line 337, in _call_chain
result = func(*args)
File "/usr/lib/python2.4/site-packages/M2Crypto/m2urllib2.py", line 82, in
https_open
h.request(req.get_method(), req.get_selector(), req.data, headers)
File "/usr/lib/python2.4/httplib.py", line 810, in request
self._send_request(method, url, body, headers)
File "/usr/lib/python2.4/httplib.py", line 833, in _send_request
self.endheaders()
File "/usr/lib/python2.4/httplib.py", line 804, in endheaders
self._send_output()
File "/usr/lib/python2.4/httplib.py", line 685, in _send_output
self.send(msg)
File "/usr/lib/python2.4/httplib.py", line 652, in send
self.connect()
File "/usr/lib/python2.4/site-packages/M2Crypto/httpslib.py", line 47, in
connect
self.sock.connect((self.host, self.port))
File "/usr/lib/python2.4/site-packages/M2Crypto/SSL/Connection.py", line
177, in connect
if not check(self.get_peer_cert(), self.addr[0]):
File "/usr/lib/python2.4/site-packages/M2Crypto/SSL/Checker.py", line 88,
in __call__
fieldName='subjectAltName')
M2Crypto.SSL.Checker.WrongHost: Peer certificate subjectAltName does not match host,
expected
penguin-a1300-01.rhts.eng.bos.redhat.com, got DNS:
diff --git a/spacewalk/certs-tools/sslToolConfig.py
b/spacewalk/certs-tools/sslToolConfig.py
index 187e594..bae5b19 100644
--- a/spacewalk/certs-tools/sslToolConfig.py
+++ b/spacewalk/certs-tools/sslToolConfig.py
@@ -446,16 +446,16 @@ subjectAltName = @alt_names
"""
-def gen_req_alt_names(d):
+def gen_req_alt_names(d, hostname):
""" generates the alt_names section of the *-openssl.cnf file
"""
i = 0
result = ''
+ dnsname = [ hostname ]
if '--set-cname' in d and d['--set-cname']:
- for name in d['--set-cname']:
- i += 1
- result += "DNS.%d = %s\n" % (i, name)
- if not result:
- result = "DNS.1 =\n"
+ dnsname.extend(d['--set-cname'])
+ for name in dnsname:
+ i += 1
+ result += "DNS.%d = %s\n" % (i, name)
return result
def gen_req_distinguished_name(d):
@@ -731,7 +731,7 @@ serial = $dir/serial
)
else:
openssl_cnf = CONF_TEMPLATE_SERVER \
- % (gen_req_distinguished_name(rdn), gen_req_alt_names(d))
+ % (gen_req_distinguished_name(rdn), gen_req_alt_names(d,
rdn['CN']))
try:
rotated = rotateFile(filepath=self.filename,verbosity=verbosity)