← Back to branch summary

~gandelman-a/ubuntu/precise/keystone/UCA_2012.2.1

« back to all changes in this revision

Viewing changes to keystone/common/cms.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Soren Hansen, Logan Rosen, Chuck Short
  • Date: 2012-09-07 13:04:01 UTC
  • mfrom: (1.1.22)
  • Revision ID: package-import@ubuntu.com-20120907130401-o49wh9xxkr2cmuqx
Tags: 2012.2~rc1~20120906.2517-0ubuntu2
https://launchpad.net/bugs/998991
[ Adam Gandelman ]
* Refreshed patches.

[ Soren Hansen ]
* Update debian/watch to account for symbolically named tarballs and
  use newer URL.
* Fix Launchpad URLs in debian/watch.

[ Logan Rosen ]
* Fix control file to suggest python-memcache instead of python-memcached
  (LP: #998991).

[ Chuck Short ]
* New upstream version.
* Dont FTBFS if the testsuite fails.

Show diffs side-by-side

added added

removed removed

Lines of Context:
keystone/common/cms.py
1
 
import os
2
 
import stat
3
1
import subprocess
4
2
 
5
3
from keystone.common import logging
76
74
        LOG.error('Signing error: %s' % err)
77
75
        raise subprocess.CalledProcessError(retcode,
78
76
                                            "openssl", output=output)
 
77
    return output
 
78
 
 
79
 
 
80
def cms_sign_token(text, signing_cert_file_name, signing_key_file_name):
 
81
    output = cms_sign_text(text, signing_cert_file_name, signing_key_file_name)
79
82
    return cms_to_token(output)
80
83
 
81
84