dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[project @ Arch-1:robey@lag.net--2003-public%secsh--dev--1.0--patch-25] 

pkey no longer raises binascii.Error
catch binascii.Error in the private key decoder and convert it into an
SSHException.  there's no reason people should have to care that it was a
decoding error vs. any of the other million things that could be wrong in
a corrupt key file.
This commit is contained in:
Robey Pointer 2004-01-27 02:00:19 +00:00
parent ea8c1378e8
commit 27869f1d7a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
paramiko/pkey.py
View File

@ -150,8 +150,7 @@ class PKey (object):
@raise IOError: if there was an error reading the file. @raise IOError: if there was an error reading the file.
@raise PasswordRequiredException: if the private key file is @raise PasswordRequiredException: if the private key file is
encrypted, and C{password} is C{None}. encrypted, and C{password} is C{None}.
@raise SSHException: if the key file is invalid @raise SSHException: if the key file is invalid.
@raise binascii.Error: on base64 decoding error
""" """
pass pass
@ -177,7 +176,6 @@ class PKey (object):
@raise PasswordRequiredException: if the private key file is @raise PasswordRequiredException: if the private key file is
encrypted, and C{password} is C{None}. encrypted, and C{password} is C{None}.
@raise SSHException: if the key file is invalid. @raise SSHException: if the key file is invalid.
@raise binascii.Error: on base64 decoding error.
""" """
f = open(filename, 'r') f = open(filename, 'r')
lines = f.readlines() lines = f.readlines()
@ -201,7 +199,10 @@ class PKey (object):
while (lines[end].strip() != '-----END ' + tag + ' PRIVATE KEY-----') and (end < len(lines)): while (lines[end].strip() != '-----END ' + tag + ' PRIVATE KEY-----') and (end < len(lines)):
end += 1 end += 1
# if we trudged to the end of the file, just try to cope. # if we trudged to the end of the file, just try to cope.
try:
data = base64.decodestring(''.join(lines[start:end])) data = base64.decodestring(''.join(lines[start:end]))
except binascii.Error, e:
raise SSHException('base64 decoding error: ' + str(e))
if not headers.has_key('proc-type'): if not headers.has_key('proc-type'):
# unencryped: done # unencryped: done
return data return data