lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

Some minor improvements to passphrase_to_key().

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

26
libssh/keyfiles.c
View File

@@ -190,28 +190,36 @@ static int read_line(char *data, unsigned int len, FILE *fp) {
static int passphrase_to_key(char *data, unsigned int datalen, static int passphrase_to_key(char *data, unsigned int datalen,
unsigned char *salt, unsigned char *key, unsigned int keylen) { unsigned char *salt, unsigned char *key, unsigned int keylen) {
MD5CTX md; MD5CTX md;
unsigned char digest[MD5_DIGEST_LEN]; unsigned char digest[MD5_DIGEST_LEN] = {0};
unsigned int i; unsigned int i;
unsigned int j; unsigned int j;
unsigned int md_not_empty; unsigned int md_not_empty;
for (j=0,md_not_empty=0;j<keylen;) for (j = 0, md_not_empty = 0; j < keylen; ) {
{
md = md5_init(); md = md5_init();
if (!md) if (md == NULL) {
return 0; return 0;
if (md_not_empty) }
if (md_not_empty) {
md5_update(md, digest, MD5_DIGEST_LEN); md5_update(md, digest, MD5_DIGEST_LEN);
else } else {
md_not_empty = 1; md_not_empty = 1;
}
md5_update(md, data, datalen); md5_update(md, data, datalen);
if (salt) if (salt) {
md5_update(md, salt, PKCS5_SALT_LEN); md5_update(md, salt, PKCS5_SALT_LEN);
}
md5_final(digest, md); md5_final(digest, md);
for (i = 0; j < keylen && i < MD5_DIGEST_LEN; j++, i++)
if (key) for (i = 0; j < keylen && i < MD5_DIGEST_LEN; j++, i++) {
if (key) {
key[j] = digest[i]; key[j] = digest[i];
} }
}
}
return 1; return 1;
} }