Correctly identify PEM files generated from PKCS12 files in oauth2client.

Correctly identify PEM files generated from PKCS12 files in oauth2client.

[zwilt, 2013-10-29 18:50:15]

Hi Joe,

This is the patch I mentioned by email earlier, which addresses
https://code.google.com/p/google-api-python-client/issues/detail?id=291.

Please ignore Patch Set 1 - for some reason the diffs are broken there and don't
show up, but they are instead in Patch Set 2.

Thanks,
-Zach

[jcgregorio_google, 2013-10-29 18:55:51]

https://codereview.appspot.com/19380043/diff/20001/oauth2client/crypt.py
File oauth2client/crypt.py (right):

https://codereview.appspot.com/19380043/diff/20001/oauth2client/crypt.py#newc...
oauth2client/crypt.py:274: return
raw_key_input[raw_key_input.find(pem_key_delimiter):]
This does the string search twice, instead just do it once:

offset = raw_key_input.find(pem_key_delimiter)
if offset != -1:
  return raw_key_input[offset:]
else:
  return None

[zwilt, 2013-10-29 19:05:32]

Thanks; PTAL

https://codereview.appspot.com/19380043/diff/20001/oauth2client/crypt.py
File oauth2client/crypt.py (right):

https://codereview.appspot.com/19380043/diff/20001/oauth2client/crypt.py#newc...
oauth2client/crypt.py:274: return
raw_key_input[raw_key_input.find(pem_key_delimiter):]
On 2013/10/29 18:55:51, jcgregorio_google wrote:
> This does the string search twice, instead just do it once:
> 
> offset = raw_key_input.find(pem_key_delimiter)
> if offset != -1:
>   return raw_key_input[offset:]
> else:
>   return None

Done.

[jcgregorio_google, 2013-10-29 19:09:42]

https://codereview.appspot.com/19380043/diff/40001/oauth2client/crypt.py
File oauth2client/crypt.py (right):

https://codereview.appspot.com/19380043/diff/40001/oauth2client/crypt.py#newc...
oauth2client/crypt.py:272: pem_key_delimiter = '-----BEGIN '
pem_key_delimeter is now only used once, it can be removed and you can just use
the '-----BEGIN' string in the line below.

[zwilt, 2013-10-29 19:51:04]

PTAL

https://codereview.appspot.com/19380043/diff/40001/oauth2client/crypt.py
File oauth2client/crypt.py (right):

https://codereview.appspot.com/19380043/diff/40001/oauth2client/crypt.py#newc...
oauth2client/crypt.py:272: pem_key_delimiter = '-----BEGIN '
On 2013/10/29 19:09:42, jcgregorio_google wrote:
> pem_key_delimeter is now only used once, it can be removed and you can just
use
> the '-----BEGIN' string in the line below.

Done.

[jcgregorio_google, 2013-10-29 19:55:37]

On 2013/10/29 19:51:04, zwilt wrote:
> PTAL
> 
> https://codereview.appspot.com/19380043/diff/40001/oauth2client/crypt.py
> File oauth2client/crypt.py (right):
> 
>
https://codereview.appspot.com/19380043/diff/40001/oauth2client/crypt.py#newc...
> oauth2client/crypt.py:272: pem_key_delimiter = '-----BEGIN '
> On 2013/10/29 19:09:42, jcgregorio_google wrote:
> > pem_key_delimeter is now only used once, it can be removed and you can just
> use
> > the '-----BEGIN' string in the line below.
> 
> Done.

LGTM

[jcgregorio_google, 2013-10-29 20:03:46]

On 2013/10/29 19:55:37, jcgregorio_google wrote:
> On 2013/10/29 19:51:04, zwilt wrote:
> > PTAL
> > 
> > https://codereview.appspot.com/19380043/diff/40001/oauth2client/crypt.py
> > File oauth2client/crypt.py (right):
> > 
> >
>
https://codereview.appspot.com/19380043/diff/40001/oauth2client/crypt.py#newc...
> > oauth2client/crypt.py:272: pem_key_delimiter = '-----BEGIN '
> > On 2013/10/29 19:09:42, jcgregorio_google wrote:
> > > pem_key_delimeter is now only used once, it can be removed and you can
just
> > use
> > > the '-----BEGIN' string in the line below.
> > 
> > Done.
> 
> LGTM

Committed in
https://code.google.com/p/google-api-python-client/source/detail?r=186e2bb779...

[zwilt, 2013-10-29 20:37:50]

Excellent, thanks Joe.


On Tue, Oct 29, 2013 at 1:03 PM, <jcgregorio@google.com> wrote:

> On 2013/10/29 19:55:37, jcgregorio_google wrote:
>
>> On 2013/10/29 19:51:04, zwilt wrote:
>> > PTAL
>> >
>> >
>>
> https://codereview.appspot.**com/19380043/diff/40001/**
>
oauth2client/crypt.py<https://codereview.appspot.com/19380043/diff/40001/oauth2client/crypt.py>
>
>> > File oauth2client/crypt.py (right):
>> >
>> >
>>
>
> https://codereview.appspot.**com/19380043/diff/40001/**
>
oauth2client/crypt.py#**newcode272<https://codereview.appspot.com/19380043/diff/40001/oauth2client/crypt.py#newcode272>
>
>> > oauth2client/crypt.py:272: pem_key_delimiter = '-----BEGIN '
>> > On 2013/10/29 19:09:42, jcgregorio_google wrote:
>> > > pem_key_delimeter is now only used once, it can be removed and you
>>
> can just
>
>> > use
>> > > the '-----BEGIN' string in the line below.
>> >
>> > Done.
>>
>
>  LGTM
>>
>
> Committed in
> https://code.google.com/p/**google-api-python-client/**source/detail?r=**
>
186e2bb7794bfdf62f06c39cf66628**8fa6bf452f<https://code.google.com/p/google-api-python-client/source/detail?r=186e2bb7794bfdf62f06c39cf666288fa6bf452f>
>
>
https://codereview.appspot.**com/19380043/<https://codereview.appspot.com/193...
>