shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

Reformat asn1_check_sequence() and read_line().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@552 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-18 15:12:50 +00:00
parent 479744b146
commit 163fbfa44d
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libssh/keyfiles.c
View File

@@ -144,22 +144,29 @@ static STRING *asn1_get_int(BUFFER *buffer) {
} }
static int asn1_check_sequence(BUFFER *buffer) { static int asn1_check_sequence(BUFFER *buffer) {
unsigned char *j = NULL;
unsigned char tmp; unsigned char tmp;
unsigned char *j;
int i; int i;
u32 size; u32 size;
u32 padding; 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; 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, 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 0; /* but nothing else */
}
} }
}
return 1; return 1;
} }
@@ -167,12 +174,16 @@ static int read_line(char *data, unsigned int len, FILE *fp) {
char tmp; char tmp;
unsigned int i; 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; return i;
if (i>=len) }
if (i >= len) {
return -1; return -1;
}
return 0; return 0;
} }