openstack/deb-python-oauth2client
Code Issues Proposed changes

Correct a typo.

Browse Source
This commit is contained in:
Craig Citro
2014-06-19 22:21:46 -07:00
parent 09e862a28a
commit c4a3b62a30
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
oauth2client/crypt.py
View File

@@ -235,7 +235,7 @@ try:
pkey = RSA.importKey(parsed_pem_key) pkey = RSA.importKey(parsed_pem_key)
else: else:
raise NotImplementedError( raise NotImplementedError(
'PKCS12 format is not supported by the PyCrpto library. ' 'PKCS12 format is not supported by the PyCrypto library. '
'Try converting to a "PEM" ' 'Try converting to a "PEM" '
'(openssl pkcs12 -in xxxxx.p12 -nodes -nocerts > privatekey.pem) ' '(openssl pkcs12 -in xxxxx.p12 -nodes -nocerts > privatekey.pem) '
'or using PyOpenSSL if native code is an option.') 'or using PyOpenSSL if native code is an option.')
@@ -259,13 +259,13 @@ else:
def _parse_pem_key(raw_key_input): def _parse_pem_key(raw_key_input):
"""Identify and extract PEM keys. """Identify and extract PEM keys.
Determines whether the given key is in the format of PEM key, and extracts Determines whether the given key is in the format of PEM key, and extracts
the relevant part of the key if it is. the relevant part of the key if it is.
Args: Args:
raw_key_input: The contents of a private key file (either PEM or PKCS12). raw_key_input: The contents of a private key file (either PEM or PKCS12).
Returns: Returns:
string, The actual key if the contents are from a PEM file, or else None. string, The actual key if the contents are from a PEM file, or else None.
""" """