tschwery/alock
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* cosmetic issues on some files (fprintf, etc)

Browse source 
--HG--
extra : convert_revision : svn%3Aeebe1cee-a9af-4fe4-bd26-ad572b19c5ab/trunk%4056
This commit is contained in:
mathias 2006-09-22 07:26:35 +00:00
parent c4548efce3
commit 9d3bbc2c2e
3 changed files with 51 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/auth_md5.c
View file

@ -308,7 +308,7 @@ static int alock_auth_md5_init(const char* args) {
if (!userhash)
userhash = strdup(&arg[5]);
} else {
printf("alock: error, missing or incorrect hash for [md5].\n");
fprintf(stderr, "alock: error, missing or incorrect hash for [md5].\n");
free(arguments);
return 0;
}
@ -317,24 +317,26 @@ static int alock_auth_md5_init(const char* args) {
FILE* hashfile = fopen(&arg[5], "r");
if (hashfile) {
int c;
unsigned int i = 0;
size_t i = 0;
tmp_hash = (char*)malloc(MD5_DIGEST_STRING_LENGTH);
memset(tmp_hash, 0, MD5_DIGEST_STRING_LENGTH);
for(i = 0, c = fgetc(hashfile);
i < MD5_DIGEST_STRING_LENGTH - 1 && c != EOF; i++, c = fgetc(hashfile)) {
tmp_hash[i] = tolower(c);
tmp_hash[i] = c;
}
fclose(hashfile);
} else {
printf("alock: error, couldnt read [%s] for [md5].\n",
fprintf(stderr, "alock: error, couldnt read [%s] for [md5].\n",
&arg[5]);
free(arguments);
return 0;
}
if (!tmp_hash || strlen(tmp_hash) != MD5_DIGEST_STRING_LENGTH - 1) {
printf("alock: error, given file [%s] doesnt contain a valid hash for [md5].\n",
fprintf(stderr, "alock: error, given file [%s] doesnt contain a valid hash for [md5].\n",
&arg[5]);
if (tmp_hash)
free(tmp_hash);
free(arguments);
return 0;
}
@ -350,7 +352,7 @@ static int alock_auth_md5_init(const char* args) {
}
if (!userhash) {
printf("alock: error, missing hash for [md5].\n");
fprintf(stderr, "alock: error, missing hash for [md5].\n");
return 0;
}
@ -369,7 +371,7 @@ static int alock_auth_md5_auth(const char* pass) {
unsigned char digest[MD5_DIGEST_LENGTH];
unsigned char stringdigest[MD5_DIGEST_STRING_LENGTH];
unsigned int i;
size_t i;
md5Context md5;
if (!pass || !userhash)

16
src/auth_sha1.c
View file

@ -246,7 +246,7 @@ static int alock_auth_sha1_init(const char* args) {
if (!userhash)
userhash = strdup(&arg[5]);
} else {
printf("alock: error, missing or incorrect hash for [sha1].\n");
fprintf(stderr, "alock: error, missing or incorrect hash for [sha1].\n");
free(arguments);
return 0;
}
@ -255,24 +255,26 @@ static int alock_auth_sha1_init(const char* args) {
FILE* hashfile = fopen(&arg[5], "r");
if (hashfile) {
int c;
unsigned int i = 0;
size_t i = 0;
tmp_hash = (char*)malloc(SHA1_DIGEST_STRING_LENGTH);
memset(tmp_hash, 0, SHA1_DIGEST_STRING_LENGTH);
for(i = 0, c = fgetc(hashfile);
i < SHA1_DIGEST_STRING_LENGTH - 1 && c != EOF; i++, c = fgetc(hashfile)) {
tmp_hash[i] = tolower(c);
tmp_hash[i] = c;
}
fclose(hashfile);
} else {
printf("alock: error, couldnt read [%s] for [sha1].\n",
fprintf(stderr, "alock: error, couldnt read [%s] for [sha1].\n",
&arg[5]);
free(arguments);
return 0;
}
if (!tmp_hash || strlen(tmp_hash) != SHA1_DIGEST_STRING_LENGTH - 1) {
printf("alock: error, given file [%s] doesnt contain a valid hash for [sha1].\n",
fprintf(stderr, "alock: error, given file [%s] doesnt contain a valid hash for [sha1].\n",
&arg[5]);
if (tmp_hash)
free(tmp_hash);
free(arguments);
return 0;
}
@ -307,7 +309,7 @@ static int alock_auth_sha1_auth(const char* pass) {
unsigned char digest[SHA1_DIGEST_LENGTH];
unsigned char stringdigest[SHA1_DIGEST_STRING_LENGTH];
unsigned int i;
size_t i;
sha1Context sha1;
if (!pass || !userhash)
@ -322,7 +324,7 @@ static int alock_auth_sha1_auth(const char* pass) {
sprintf((char*)&stringdigest[i*2], "%02x", digest[i]);
}
return !strcmp((char*)stringdigest, userhash);
return (strcmp((char*)stringdigest, userhash) == 0);
}
struct aAuth alock_auth_sha1 = {

53
src/auth_sha2.c
View file

@ -19,7 +19,9 @@
about :
provide -auth sha1:hash=<hash>,file=<filename>
provide -auth sha256:hash=<hash>,file=<filename>
provide -auth sha384:hash=<hash>,file=<filename>
provide -auth sha512:hash=<hash>,file=<filename>
\* ---------------------------------------------------------------- */
@ -868,12 +870,6 @@ void sha384_final(u_int8_t digest[], sha384Context *context) {
/* ---------------------------------------------------------------- *\
\* ---------------------------------------------------------------- */
#ifndef STAND_ALONE
static char* userhash = NULL;
static unsigned int method = 0;
static char* method_string = NULL;
static size_t method_digest_string_length = 0;
enum {
NONE = 0,
@ -882,6 +878,14 @@ enum {
SHA512 = 512
};
#ifndef STAND_ALONE
static char* userhash = NULL;
static unsigned int method = 0;
static char* method_string = NULL;
static size_t method_digest_string_length = 0;
static int alock_auth_sha2_init(const char* args) {
if (!args) {
@ -902,7 +906,7 @@ static int alock_auth_sha2_init(const char* args) {
method_string = strdup("sha384");
method_digest_string_length = SHA384_DIGEST_STRING_LENGTH;
} else {
printf("alock: error, not supported hash in [sha2].\n");
fprintf(stderr, "alock: error, not supported hash in [sha2].\n");
return 0;
}
@ -920,7 +924,7 @@ static int alock_auth_sha2_init(const char* args) {
if (!userhash)
userhash = strdup(&arg[5]);
} else {
printf("alock: error, missing or incorrect hash for [%s].\n", method_string);
fprintf(stderr, "alock: error, missing or incorrect hash for [%s].\n", method_string);
free(arguments);
return 0;
}
@ -929,16 +933,16 @@ static int alock_auth_sha2_init(const char* args) {
FILE* hashfile = fopen(&arg[5], "r");
if (hashfile) {
int c;
unsigned int i = 0;
size_t i = 0;
tmp_hash = (char*)malloc(method_digest_string_length);
memset(tmp_hash, 0, method_digest_string_length);
for(i = 0, c = fgetc(hashfile);
i < method_digest_string_length - 1 && c != EOF; i++, c = fgetc(hashfile)) {
tmp_hash[i] = tolower(c);
tmp_hash[i] = c;
}
fclose(hashfile);
} else {
printf("alock: error, couldnt read [%s] for [%s].\n",
fprintf(stderr, "alock: error, couldnt read [%s] for [%s].\n",
&arg[5], method_string);
free(method_string);
free(arguments);
@ -946,8 +950,10 @@ static int alock_auth_sha2_init(const char* args) {
}
if (!tmp_hash || strlen(tmp_hash) != method_digest_string_length - 1) {
printf("alock: error, given file [%s] doesnt contain a valid hash for [%s].\n",
fprintf(stderr, "alock: error, given file [%s] doesnt contain a valid hash for [%s].\n",
&arg[5], method_string);
if (tmp_hash)
free(tmp_hash);
free(method_string);
free(arguments);
return 0;
@ -965,7 +971,7 @@ static int alock_auth_sha2_init(const char* args) {
}
if (!userhash) {
printf("alock: error, missing hash for [%s].\n", method_string);
fprintf(stderr, "alock: error, missing hash for [%s].\n", method_string);
free(method_string);
return 0;
}
@ -1009,7 +1015,7 @@ static int alock_auth_sha2_auth(const char* pass) {
for (i = 0; i < SHA256_DIGEST_LENGTH; i++) {
sprintf((char*)&stringdigest[i*2], "%02x", digest[i]);
}
return !strcmp((char*)stringdigest, userhash);
return (strcmp((char*)stringdigest, userhash) == 0);
}
break;
case SHA512: {
@ -1026,7 +1032,7 @@ static int alock_auth_sha2_auth(const char* pass) {
for (i = 0; i < SHA512_DIGEST_LENGTH; i++) {
sprintf((char*)&stringdigest[i*2], "%02x", digest[i]);
}
return !strcmp((char*)stringdigest, userhash);
return (strcmp((char*)stringdigest, userhash) == 0);
}
break;
case SHA384: {
@ -1043,7 +1049,7 @@ static int alock_auth_sha2_auth(const char* pass) {
for (i = 0; i < SHA384_DIGEST_LENGTH; i++) {
sprintf((char*)&stringdigest[i*2], "%02x", digest[i]);
}
return !strcmp((char*)stringdigest, userhash);
return (strcmp((char*)stringdigest, userhash) == 0);
}
break;
};
@ -1087,17 +1093,24 @@ void usage() {
int main(int argc, char* argv[]) {
unsigned char digest[SHA512_DIGEST_LENGTH];
unsigned int i;
size_t i;
unsigned char c;
unsigned int method = 0;
size_t method_digest_length = 0;
if (argc < 2) {
if (argc < 2 || strlen(argv[1]) < 3) {
usage();
exit(EXIT_SUCCESS);
}
method = atoi(argv[1]);
if (strncmp("256", argv[1], 3) == 0)
method = SHA256;
else if (strncmp("384", argv[1], 3) == 0)
method = SHA384;
else if (strncmp("512", argv[1], 3) == 0)
method = SHA512;
else
method = NONE;
switch (method) {