github/thc-hydra
1
0
Fork 0
mirror of https://github.com/vanhauser-thc/thc-hydra.git synced 2025-08-22 14:23:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

snmp: fix some clang warnings by casting vars and changing types.

Browse source
This commit is contained in:
Dario Lombardo 2017-08-17 00:15:20 +02:00
commit 2950dcdc68
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hydra-mod.c
View file

@ -1151,7 +1151,7 @@ void hydra_tobase64(unsigned char *buf, uint32_t buflen, uint32_t bufsize) {
strcpy((char *) buf, (char *) bof); /* can not overflow */ strcpy((char *) buf, (char *) bof); /* can not overflow */
} }
void hydra_dump_asciihex(unsigned char *string, int32_t length) { void hydra_dump_asciihex(char *string, int32_t length) {
unsigned char *p = (unsigned char *) string; unsigned char *p = (unsigned char *) string;
unsigned char lastrow_data[16]; unsigned char lastrow_data[16];
int32_t rows = length / HYDRA_DUMP_ROWS; int32_t rows = length / HYDRA_DUMP_ROWS;

2
hydra-mod.h
View file

@ -31,7 +31,7 @@ extern int32_t hydra_send(int32_t socket, char *buf, uint32_t size, int32_t opti
extern int32_t make_to_lower(char *buf); extern int32_t make_to_lower(char *buf);
extern unsigned char hydra_conv64(unsigned char in); extern unsigned char hydra_conv64(unsigned char in);
extern void hydra_tobase64(unsigned char *buf, uint32_t buflen, uint32_t bufsize); extern void hydra_tobase64(unsigned char *buf, uint32_t buflen, uint32_t bufsize);
extern void hydra_dump_asciihex(unsigned char *string, int32_t length); extern void hydra_dump_asciihex(char *string, int32_t length);
extern void hydra_set_srcport(int32_t port); extern void hydra_set_srcport(int32_t port);
extern char *hydra_address2string(char *address); extern char *hydra_address2string(char *address);
extern char *hydra_address2string_beautiful(char *address); extern char *hydra_address2string_beautiful(char *address);

38
hydra-snmp.c
View file

@ -15,7 +15,7 @@ extern int32_t child_head_no;
char snmpv3buf[1024], *snmpv3info = NULL; char snmpv3buf[1024], *snmpv3info = NULL;
int32_t snmpv3infolen = 0, snmpversion = 1, snmpread = 1, hashtype = 1, enctype = 0; int32_t snmpv3infolen = 0, snmpversion = 1, snmpread = 1, hashtype = 1, enctype = 0;
unsigned char snmpv3_init[] = { 0x30, 0x3e, 0x02, 0x01, 0x03, 0x30, 0x11, 0x02, char snmpv3_init[] = { 0x30, 0x3e, 0x02, 0x01, 0x03, 0x30, 0x11, 0x02,
0x04, 0x08, 0x86, 0xdd, 0xf0, 0x02, 0x03, 0x00, 0x04, 0x08, 0x86, 0xdd, 0xf0, 0x02, 0x03, 0x00,
0xff, 0xe3, 0x04, 0x01, 0x04, 0x02, 0x01, 0x03, 0xff, 0xe3, 0x04, 0x01, 0x04, 0x02, 0x01, 0x03,
0x04, 0x10, 0x30, 0x0e, 0x04, 0x00, 0x02, 0x01, 0x04, 0x10, 0x30, 0x0e, 0x04, 0x00, 0x02, 0x01,
@ -39,7 +39,7 @@ unsigned char snmpv3_get2[] = { 0x30, 0x2e, 0x04, 0x0c, 0x80, 0x00, 0x00,
0x00 0x00
}; };
unsigned char snmpv3_nouser[] = { 0x04, 0x00, 0x04, 0x00, 0x04, 0x00 }; char snmpv3_nouser[] = { 0x04, 0x00, 0x04, 0x00, 0x04, 0x00 };
struct SNMPV1_A { struct SNMPV1_A {
char ID; char ID;
@ -94,13 +94,13 @@ struct SNMPV1_W {
}; };
#ifdef LIBOPENSSL #ifdef LIBOPENSSL
void password_to_key_md5(u_char * password, /* IN */ void password_to_key_md5(char * password, /* IN */
u_int passwordlen, /* IN */ u_int passwordlen, /* IN */
u_char * engineID, /* IN - pointer to snmpEngineID */ char * engineID, /* IN - pointer to snmpEngineID */
u_int engineLength, /* IN - length of snmpEngineID */ u_int engineLength, /* IN - length of snmpEngineID */
u_char * key) { /* OUT - pointer to caller 16-octet buffer */ char * key) { /* OUT - pointer to caller 16-octet buffer */
MD5_CTX MD; MD5_CTX MD;
u_char *cp, password_buf[80], *mypass = password, bpass[17]; char *cp, password_buf[80], *mypass = password, bpass[17];
u_long password_index = 0, count = 0, i, mylen, myelen = engineLength; u_long password_index = 0, count = 0, i, mylen, myelen = engineLength;
if (strlen(password) > passwordlen) if (strlen(password) > passwordlen)
@ -133,7 +133,7 @@ void password_to_key_md5(u_char * password, /* IN */
MD5_Update(&MD, password_buf, 64); MD5_Update(&MD, password_buf, 64);
count += 64; count += 64;
} }
MD5_Final(key, &MD); /* tell MD5 we're done */ MD5_Final((unsigned char *)key, &MD); /* tell MD5 we're done */
/* Now localize the key with the engineID and pass */ /* Now localize the key with the engineID and pass */
/* through MD5 to produce final key */ /* through MD5 to produce final key */
/* May want to ensure that engineLength <= 32, */ /* May want to ensure that engineLength <= 32, */
@ -143,24 +143,24 @@ void password_to_key_md5(u_char * password, /* IN */
memcpy(password_buf + 16 + myelen, key, 16); memcpy(password_buf + 16 + myelen, key, 16);
MD5_Init(&MD); MD5_Init(&MD);
MD5_Update(&MD, password_buf, 32 + myelen); MD5_Update(&MD, password_buf, 32 + myelen);
MD5_Final(key, &MD); MD5_Final((unsigned char *)key, &MD);
return; return;
} }
void password_to_key_sha(u_char * password, /* IN */ void password_to_key_sha(char * password, /* IN */
u_int passwordlen, /* IN */ u_int passwordlen, /* IN */
u_char * engineID, /* IN - pointer to snmpEngineID */ char * engineID, /* IN - pointer to snmpEngineID */
u_int engineLength, /* IN - length of snmpEngineID */ u_int engineLength, /* IN - length of snmpEngineID */
u_char * key) { /* OUT - pointer to caller 20-octet buffer */ char * key) { /* OUT - pointer to caller 20-octet buffer */
SHA_CTX SH; SHA_CTX SH;
u_char *cp, password_buf[80], *mypass = password, bpass[17]; char *cp, password_buf[80], *mypass = password, bpass[17];
u_long password_index = 0, count = 0, i, mylen = passwordlen, myelen = engineLength; u_long password_index = 0, count = 0, i, mylen = passwordlen, myelen = engineLength;
if (mylen < 8) { if (mylen < 8) {
memset(bpass, 0, sizeof(bpass)); memset(bpass, 0, sizeof(bpass));
strcpy(bpass, password); strcpy((char *)bpass, password);
while (mylen < 8) { while (mylen < 8) {
strcat(bpass, password); strcat((char *)bpass, password);
mylen += passwordlen; mylen += passwordlen;
} }
mypass = bpass; mypass = bpass;
@ -181,7 +181,7 @@ void password_to_key_sha(u_char * password, /* IN */
SHA1_Update(&SH, password_buf, 64); SHA1_Update(&SH, password_buf, 64);
count += 64; count += 64;
} }
SHA1_Final(key, &SH); /* tell SHA we're done */ SHA1_Final((unsigned char *)key, &SH); /* tell SHA we're done */
/* Now localize the key with the engineID and pass */ /* Now localize the key with the engineID and pass */
/* through SHA to produce final key */ /* through SHA to produce final key */
/* May want to ensure that engineLength <= 32, */ /* May want to ensure that engineLength <= 32, */
@ -191,7 +191,7 @@ void password_to_key_sha(u_char * password, /* IN */
memcpy(password_buf + 20 + myelen, key, 20); memcpy(password_buf + 20 + myelen, key, 20);
SHA1_Init(&SH); SHA1_Init(&SH);
SHA1_Update(&SH, password_buf, 40 + myelen); SHA1_Update(&SH, password_buf, 40 + myelen);
SHA1_Final(key, &SH); SHA1_Final((unsigned char *)key, &SH);
return; return;
} }
#endif #endif
@ -336,7 +336,7 @@ int32_t start_snmp(int32_t s, char *ip, int32_t port, unsigned char options, cha
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
initVect[i] ^= privacy_params[i]; initVect[i] ^= privacy_params[i];
DES_key_sched((const_DES_cblock *) key, &symcbc); DES_key_sched((const_DES_cblock *) key, &symcbc);
DES_ncbc_encrypt(snmpv3_get2 + 2, buf, sizeof(snmpv3_get2) - 2, &symcbc, (const_DES_cblock *) (initVect), DES_ENCRYPT); DES_ncbc_encrypt(snmpv3_get2 + 2, (unsigned char *)buf, sizeof(snmpv3_get2) - 2, &symcbc, (const_DES_cblock *) (initVect), DES_ENCRYPT);
#endif #endif
@ -367,10 +367,10 @@ int32_t start_snmp(int32_t s, char *ip, int32_t port, unsigned char options, cha
i++; // just to conform with the snmpv1/2 code i++; // just to conform with the snmpv1/2 code
#ifdef LIBOPENSSL #ifdef LIBOPENSSL
if (hashtype == 1) { if (hashtype == 1) {
HMAC((EVP_MD *) EVP_md5(), key, 16, buffer, i - 1, hash, NULL); HMAC((EVP_MD *) EVP_md5(), key, 16, (const unsigned char*)buffer, i - 1, (unsigned char *)hash, NULL);
memcpy(buffer + off, hash, 12); memcpy(buffer + off, hash, 12);
} else if (hashtype == 2) { } else if (hashtype == 2) {
HMAC((EVP_MD *) EVP_sha1(), key, 20, buffer, i - 1, hash, NULL); HMAC((EVP_MD *) EVP_sha1(), key, 20, (const unsigned char *)buffer, i - 1, (unsigned char *)hash, NULL);
memcpy(buffer + off, hash, 12); memcpy(buffer + off, hash, 12);
} }
#endif #endif