← Back to branch summary

~ubuntu-branches/ubuntu/wily/keystone/wily

« back to all changes in this revision

Viewing changes to keystone/common/openssl.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2013-10-02 11:46:14 UTC
  • mfrom: (1.1.37)
  • Revision ID: package-import@ubuntu.com-20131002114614-pw4xkjdvowr9u34w
Tags: 1:2013.2~rc1-0ubuntu1
* New upstream version.
* debian/control:
  - Add versioned dependencies to python-pbr, python-dogpile.cache,
    python-oslo.config, python-webob, python-pam, python-sqlalchemy,
    python-testtools, and python-requests.
  - Added python-greenlet, python-requests, python-netifaces,
    and python-setuptools as a build dependency.
  - Dropped python-swift, python-unittest, python-d2to1,
    as a build dependency.
  - Bumped versioned depends for python-keystoneclient.
* debian/patches/disable-oauth2.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
keystone/common/openssl.py
1
1
# vim: tabstop=4 shiftwidth=4 softtabstop=4
2
2
 
3
 
# Copyright 2012 OpenStack LLC
 
3
# Copyright 2012 OpenStack Foundation
4
4
#
5
5
# Licensed under the Apache License, Version 2.0 (the "License"); you may
6
6
# not use this file except in compliance with the License. You may obtain
58
58
                               'signing_cert': conf_obj.certfile,
59
59
                               'key_size': int(conf_obj.key_size),
60
60
                               'valid_days': int(conf_obj.valid_days),
61
 
                               'cert_subject': conf_obj.cert_subject,
62
 
                               'ca_password': conf_obj.ca_password}
 
61
                               'cert_subject': conf_obj.cert_subject}
63
62
 
64
63
        try:
65
64
            # OpenSSL 1.0 and newer support default_md = default, olders do not
133
132
                        group=self.use_keystone_group, log=LOG)
134
133
        if not file_exists(ca_cert):
135
134
            self.exec_command('openssl req -new -x509 -extensions v3_ca '
136
 
                              '-passin pass:%(ca_password)s '
137
135
                              '-key %(ca_private_key)s -out %(ca_cert)s '
138
136
                              '-days %(valid_days)d '
139
137
                              '-config %(ssl_config)s '
165
163
                        user=self.use_keystone_user,
166
164
                        group=self.use_keystone_group, log=LOG)
167
165
        if not file_exists(signing_cert):
168
 
            self.exec_command('openssl req -key %(signing_key)s -new -nodes '
 
166
            self.exec_command('openssl req -key %(signing_key)s -new '
169
167
                              '-out %(request_file)s -config %(ssl_config)s '
170
168
                              '-subj %(cert_subject)s')
171
169