diff options
author | milo <milo@r0ot.me> | 2011-03-09 12:58:47 +0100 |
---|---|---|
committer | milo <milo@r0ot.me> | 2011-04-14 14:05:44 +0200 |
commit | c20afa75a270ebc7254c763dc929c69469efe37e (patch) | |
tree | 529dbf5e18bbe25534269d5b95f4407420d011bd /src/keyfiles.c | |
parent | df3e497dbd3e52c16b77bed3379c0b281d991825 (diff) | |
download | libssh-c20afa75a270ebc7254c763dc929c69469efe37e.tar.gz libssh-c20afa75a270ebc7254c763dc929c69469efe37e.tar.xz libssh-c20afa75a270ebc7254c763dc929c69469efe37e.zip |
[pki] Fixed a probable bug in privatekey_file_to_buffer()
Diffstat (limited to 'src/keyfiles.c')
-rw-r--r-- | src/keyfiles.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/keyfiles.c b/src/keyfiles.c index 50cf7c3e..205c6592 100644 --- a/src/keyfiles.c +++ b/src/keyfiles.c @@ -532,9 +532,8 @@ static ssh_buffer privatekey_file_to_buffer(FILE *fp, int type, if (len > 11 && strncmp("Proc-Type: 4,ENCRYPTED", buf, 11) == 0) { len = read_line(buf, MAXLINESIZE, fp); if (len > 10 && strncmp("DEK-Info: ", buf, 10) == 0) { - if ((privatekey_dek_header(buf + 10, len - 10, &algo, &mode, &key_len, - &iv, &iv_len) < 0) - || read_line(buf, MAXLINESIZE, fp)) { + if (privatekey_dek_header(buf + 10, len - 10, &algo, &mode, &key_len, + &iv, &iv_len) < 0) { ssh_buffer_free(buffer); SAFE_FREE(iv); return NULL; |