diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-11-29 13:14:26 +0100 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-11-29 13:14:26 +0100 |
| commit | c5d3e310376b3fb5c548e1d2e70c5ce7a489bb9f (patch) | |
| tree | 15a73446e1daa6829a68e05a3cef862924428473 /nova/crypto.py | |
| parent | b65b41e5957d5ded516343b3611292c9744d169f (diff) | |
| parent | 4f92d1d39fcfda4dad73e6e0339351f0d7d00d61 (diff) | |
| download | nova-c5d3e310376b3fb5c548e1d2e70c5ce7a489bb9f.tar.gz nova-c5d3e310376b3fb5c548e1d2e70c5ce7a489bb9f.tar.xz nova-c5d3e310376b3fb5c548e1d2e70c5ce7a489bb9f.zip | |
Merge trunk.
Diffstat (limited to 'nova/crypto.py')
| -rw-r--r-- | nova/crypto.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nova/crypto.py b/nova/crypto.py index 045f7f53f..aacc50b17 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -15,10 +15,11 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - """ -Wrappers around standard crypto, including root and intermediate CAs, -SSH key_pairs and x509 certificates. +Wrappers around standard crypto data elements. + +Includes root and intermediate CAs, SSH key_pairs and x509 certificates. + """ import base64 @@ -227,12 +228,12 @@ def mkcacert(subject='nova', years=1): def compute_md5(fp): """ - @type fp: file - @param fp: File pointer to the file to MD5 hash. The file pointer will be + :type fp: file + :param fp: File pointer to the file to MD5 hash. The file pointer will be reset to the beginning of the file before the method returns. - @rtype: tuple - @return: the hex digest version of the MD5 hash + :rtype: tuple + :return: the hex digest version of the MD5 hash """ m = hashlib.md5() fp.seek(0) |