diff options
author | Andreas Schneider <mail@cynapses.org> | 2009-04-18 15:12:50 +0000 |
---|---|---|
committer | Andreas Schneider <mail@cynapses.org> | 2009-04-18 15:12:50 +0000 |
commit | 163fbfa44d55f08a8e5db8ffa75d5579d6526c26 (patch) | |
tree | 813ddabd80c755d7acb7e0da11ef7ec8b628a80b /libssh/keyfiles.c | |
parent | 479744b146382c4a3cecf55241d6c3126eb49bdf (diff) | |
download | libssh-163fbfa44d55f08a8e5db8ffa75d5579d6526c26.tar.gz libssh-163fbfa44d55f08a8e5db8ffa75d5579d6526c26.tar.xz libssh-163fbfa44d55f08a8e5db8ffa75d5579d6526c26.zip |
Reformat asn1_check_sequence() and read_line().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@552 7dcaeef0-15fb-0310-b436-a5af3365683c
Diffstat (limited to 'libssh/keyfiles.c')
-rw-r--r-- | libssh/keyfiles.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/libssh/keyfiles.c b/libssh/keyfiles.c index b8ebe025..89c56190 100644 --- a/libssh/keyfiles.c +++ b/libssh/keyfiles.c @@ -144,22 +144,29 @@ static STRING *asn1_get_int(BUFFER *buffer) { } static int asn1_check_sequence(BUFFER *buffer) { + unsigned char *j = NULL; unsigned char tmp; - unsigned char *j; int i; u32 size; u32 padding; - if (!buffer_get_data(buffer,&tmp,1) || tmp != ASN1_SEQUENCE) + if (buffer_get_data(buffer, &tmp, 1) == 0 || tmp != ASN1_SEQUENCE) { return 0; - size=asn1_get_len(buffer); - if ((padding = buffer_get_len(buffer) - buffer->pos - size) > 0) + } + + size = asn1_get_len(buffer); + if ((padding = buffer_get_len(buffer) - buffer->pos - size) > 0) { for (i = buffer_get_len(buffer) - buffer->pos - size, - j = buffer_get(buffer) + size + buffer->pos; i; i--, j++) + j = buffer_get(buffer) + size + buffer->pos; + i; + i--, j++) { - if (*j != padding) /* padding is allowed */ + if (*j != padding) { /* padding is allowed */ return 0; /* but nothing else */ + } } + } + return 1; } @@ -167,12 +174,16 @@ static int read_line(char *data, unsigned int len, FILE *fp) { char tmp; unsigned int i; - for (i=0; fread(&tmp, 1, 1, fp) && tmp!='\n' && i<len; data[i++]=tmp) + for (i = 0; fread(&tmp, 1, 1, fp) && tmp != '\n' && i < len; data[i++] = tmp) ; - if (tmp=='\n') + if (tmp == '\n') { return i; - if (i>=len) + } + + if (i >= len) { return -1; + } + return 0; } |