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

Reformat some functions.

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@550 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-18 14:56:56 +00:00
parent c373e9bb03
commit a58b7b93de
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libssh/keyfiles.c
View File

@@ -62,8 +62,7 @@ static int load_iv(char *header, unsigned char *iv, int iv_len) {
int k; int k;
memset(iv, 0, iv_len); memset(iv, 0, iv_len);
for (i=0; i < iv_len; i++) for (i = 0; i < iv_len; i++) {
{
if ((header[2*i] >= '0') && (header[2*i] <= '9')) if ((header[2*i] >= '0') && (header[2*i] <= '9'))
j = header[2*i] - '0'; j = header[2*i] - '0';
else if ((header[2*i] >= 'A') && (header[2*i] <= 'F')) else if ((header[2*i] >= 'A') && (header[2*i] <= 'F'))
@@ -89,7 +88,7 @@ static u32 char_to_u32(unsigned char *data, u32 size) {
u32 ret; u32 ret;
u32 i; u32 i;
for (i=0,ret=0;i<size;ret=ret<<8,ret+=data[i++]) for (i = 0, ret = 0; i < size; ret = ret << 8, ret += data[i++])
; ;
return ret; return ret;
} }
@@ -98,19 +97,23 @@ static u32 asn1_get_len(BUFFER *buffer) {
u32 len; u32 len;
unsigned char tmp[4]; unsigned char tmp[4];
if (!buffer_get_data(buffer,tmp,1)) if (buffer_get_data(buffer,tmp,1) == 0) {
return 0; return 0;
if (tmp[0] > 127)
{
len=tmp[0] & 127;
if (len>4)
return 0; /* Length doesn't fit in u32. Can this really happen? */
if (!buffer_get_data(buffer,tmp,len))
return 0;
len=char_to_u32(tmp,len);
} }
else
len=char_to_u32(tmp,1); if (tmp[0] > 127) {
len = tmp[0] & 127;
if (len > 4) {
return 0; /* Length doesn't fit in u32. Can this really happen? */
}
if (buffer_get_data(buffer,tmp,len) == 0) {
return 0;
}
len = char_to_u32(tmp, len);
} else {
len = char_to_u32(tmp, 1);
}
return len; return len;
} }