diff --git a/include/nmlib.h b/include/nmlib.h index 12cbcd2..6bbb63e 100644 --- a/include/nmlib.h +++ b/include/nmlib.h @@ -134,8 +134,8 @@ bongo_ssl_context *NMAPSSLContextAlloc(void); int NMAPSendCommand(Connection *conn, const char *command, size_t length); int NMAPSendCommandF(Connection *conn, const char *format, ...) XPL_PRINTF(2, 3); -int NMAPReadResponse(Connection *conn, unsigned char *response, size_t length, BOOL check); -int NMAPReadResponseLine(Connection *conn, unsigned char *response, size_t length, BOOL check); +int NMAPReadResponse(Connection *conn, char *response, size_t length, BOOL check); +int NMAPReadResponseLine(Connection *conn, char *response, size_t length, BOOL check); int NMAPReadResponseAndCount(Connection *conn, unsigned long *count); int NMAPRunCommandF(Connection *conn, char *response, size_t length, const char *format, ...) XPL_PRINTF(4, 5); @@ -170,22 +170,22 @@ BOOL NMAPAddEvent(Connection *conn, BongoCalObject *cal, const char *calendar, c /* NMAPReadAnswer and NMAPReadAnswerLine are deprecated in favor of NMAPReadResponse and NMAPReadResponseLine */ int NMAPReadAnswer(Connection *conn, char *response, size_t length, BOOL checkForResult); -int NMAPReadAnswerLine(Connection *conn, unsigned char *response, size_t length, BOOL checkForResult); +int NMAPReadAnswerLine(Connection *conn, char *response, size_t length, BOOL checkForResult); -Connection *NMAPConnect(unsigned char *address, struct sockaddr_in *addr); -Connection *NMAPConnectEx(unsigned char *address, struct sockaddr_in *addr, TraceDestination *destination); -Connection *NMAPConnectQueue(unsigned char *address, struct sockaddr_in *addr); -Connection *NMAPConnectQueueEx(unsigned char *address, struct sockaddr_in *addr, TraceDestination *destination); -BOOL NMAPEncrypt(Connection *conn, unsigned char *response, int length, BOOL force); +Connection *NMAPConnect(char *address, struct sockaddr_in *addr); +Connection *NMAPConnectEx(char *address, struct sockaddr_in *addr, TraceDestination *destination); +Connection *NMAPConnectQueue(char *address, struct sockaddr_in *addr); +Connection *NMAPConnectQueueEx(char *address, struct sockaddr_in *addr, TraceDestination *destination); +BOOL NMAPEncrypt(Connection *conn, char *response, int length, BOOL force); -BOOL NMAPAuthenticateToStore(Connection *conn, unsigned char *response, int length); -BOOL NMAPAuthenticateToQueue(Connection *conn, unsigned char *response, int length); -int NMAPAuthenticateWithCookie(Connection *conn, const char *user, const char *cookie, unsigned char *buffer, int length); +BOOL NMAPAuthenticateToStore(Connection *conn, char *response, int length); +BOOL NMAPAuthenticateToQueue(Connection *conn, char *response, int length); +int NMAPAuthenticateWithCookie(Connection *conn, const char *user, const char *cookie, char *buffer, int length); BOOL NMAPAuthenticateThenUserAndStore(Connection *conn, unsigned char *user); void NMAPQuit(Connection *conn); -RegistrationStates QueueRegister(const unsigned char *dn, unsigned long queue, unsigned short port); +RegistrationStates QueueRegister(const char *dn, unsigned long queue, unsigned short port); #endif /* _BONGO_NMAP_LIBRARY_H */ diff --git a/include/xplhash.h b/include/xplhash.h index cce7969..6d8dd11 100644 --- a/include/xplhash.h +++ b/include/xplhash.h @@ -45,7 +45,7 @@ void XplHashWrite(xpl_hash_context *context, const void *buffer, size_t length); void XplHashFinalBytes(xpl_hash_context *context, unsigned char *buffer, size_t length); -void XplHashFinal(xpl_hash_context *context, xpl_hash_stringcase strcase, unsigned char *buffer, size_t length); +void XplHashFinal(xpl_hash_context *context, xpl_hash_stringcase strcase, char *buffer, size_t length); void XplRandomData(void *buffer, size_t length); void XplSaveRandomSeed(void); diff --git a/src/agents/store/auth.c b/src/agents/store/auth.c index fe429f8..fe0da79 100644 --- a/src/agents/store/auth.c +++ b/src/agents/store/auth.c @@ -186,7 +186,7 @@ StoreParseAccessControlList(StoreClient *client, const char *acl) CCode StoreCommandAUTHSYSTEM(StoreClient *client, char *md5hash) { - unsigned char credential[XPLHASH_MD5_LENGTH]; + char credential[XPLHASH_MD5_LENGTH]; xpl_hash_context hash; if (StoreAgent.installMode) goto success; diff --git a/src/agents/store/guid.c b/src/agents/store/guid.c index 4d30ee2..2fc1125 100644 --- a/src/agents/store/guid.c +++ b/src/agents/store/guid.c @@ -93,8 +93,8 @@ void GuidAlloc(unsigned char *guid) { int i; - unsigned char c; - unsigned char *ptr; + char c; + char *ptr; if (guid) { XplWaitOnLocalSemaphore(StoreAgent.guid.semaphore); diff --git a/src/agents/store/stored.h b/src/agents/store/stored.h index 171565e..5316020 100644 --- a/src/agents/store/stored.h +++ b/src/agents/store/stored.h @@ -262,7 +262,7 @@ struct StoreGlobals { struct { /** guid.c **/ XplSemaphore semaphore; - unsigned char next[NMAP_GUID_LENGTH]; + char next[NMAP_GUID_LENGTH]; } guid; }; diff --git a/src/libs/connio/CMakeLists.txt b/src/libs/connio/CMakeLists.txt index 1178745..0b157f6 100644 --- a/src/libs/connio/CMakeLists.txt +++ b/src/libs/connio/CMakeLists.txt @@ -1,4 +1,4 @@ -#StrictCompile() +StrictCompile() add_library(bongoconnio SHARED sockets.c diff --git a/src/libs/connio/nmap.c b/src/libs/connio/nmap.c index 394ae53..e41b247 100644 --- a/src/libs/connio/nmap.c +++ b/src/libs/connio/nmap.c @@ -35,10 +35,13 @@ #include #include +/* prototypes */ +BOOL NMAPAuthenticate(Connection *conn, char *response, int length); + struct { RegistrationStates state; - unsigned char access[NMAP_HASH_SIZE]; + char access[NMAP_HASH_SIZE]; bongo_ssl_context *context; @@ -89,10 +92,10 @@ NMAPSendCommandF(Connection *conn, const char *format, ...) } } -__inline static unsigned char * -FindNewLineChar(unsigned char *Buffer, unsigned char *EndPtr) { - register unsigned char *ptr = Buffer; - register unsigned char *endPtr = EndPtr; +__inline static char * +FindNewLineChar(char *Buffer, char *EndPtr) { + register char *ptr = Buffer; + register char *endPtr = EndPtr; do { if (ptr < endPtr) { @@ -110,7 +113,7 @@ FindNewLineChar(unsigned char *Buffer, unsigned char *EndPtr) { return(NULL); } -__inline static unsigned char * +__inline static char * FindEndOfLine(Connection *conn) { size_t count; @@ -164,7 +167,7 @@ FindEndOfLine(Connection *conn) } __inline static int -NMAPReadDataAfterResponseCode(Connection *conn, unsigned char *response, size_t length, BOOL RemoveCRLF) +NMAPReadDataAfterResponseCode(Connection *conn, char *response, size_t length, BOOL RemoveCRLF) { int ccode; int count; @@ -223,7 +226,7 @@ NMAPReadDataAfterResponseCode(Connection *conn, unsigned char *response, size_t } __inline static int -NMAPReadFullLine(Connection *conn, unsigned char *response, size_t length, BOOL RemoveCRLF) +NMAPReadFullLine(Connection *conn, char *response, size_t length, BOOL RemoveCRLF) { int ccode; int count; @@ -357,7 +360,7 @@ NMAPReadJustResponseCode(Connection *conn) */ int -NMAPReadResponse(Connection *conn, unsigned char *response, size_t length, BOOL check) +NMAPReadResponse(Connection *conn, char *response, size_t length, BOOL check) { if (response) { if (check) { @@ -377,7 +380,7 @@ NMAPReadResponse(Connection *conn, unsigned char *response, size_t length, BOOL */ int -NMAPReadResponseLine(Connection *conn, unsigned char *response, size_t length, BOOL check) +NMAPReadResponseLine(Connection *conn, char *response, size_t length, BOOL check) { if (response) { if (check) { @@ -1310,12 +1313,12 @@ nmapfinish: } int -NMAPReadAnswerLine(Connection *conn, unsigned char *response, size_t length, BOOL checkForResult) +NMAPReadAnswerLine(Connection *conn, char *response, size_t length, BOOL checkForResult) { int len; int result = -1 ; size_t count; - unsigned char *cur; + char *cur; len = ConnReadLine(conn, response, length); if (len > 0) { @@ -1337,11 +1340,13 @@ NMAPReadAnswerLine(Connection *conn, unsigned char *response, size_t length, BOO } __inline static Connection * -NmapConnect(unsigned char *address, struct sockaddr_in *addr, int port, TraceDestination *destination) +NmapConnect(char *address, struct sockaddr_in *addr, int port, TraceDestination *destination) { int ccode; Connection *conn; + UNUSED_PARAMETER(destination); + if (address || addr) { conn = ConnAlloc(TRUE); } else { @@ -1388,31 +1393,33 @@ NmapConnect(unsigned char *address, struct sockaddr_in *addr, int port, TraceDes } Connection * -NMAPConnect(unsigned char *address, struct sockaddr_in *addr) +NMAPConnect(char *address, struct sockaddr_in *addr) { return(NmapConnect(address, addr, NMAP_PORT, NULL)); } Connection * -NMAPConnectEx(unsigned char *address, struct sockaddr_in *addr, TraceDestination *destination) +NMAPConnectEx(char *address, struct sockaddr_in *addr, TraceDestination *destination) { return(NmapConnect(address, addr, NMAP_PORT, destination)); } Connection * -NMAPConnectQueue(unsigned char *address, struct sockaddr_in *addr) +NMAPConnectQueue(char *address, struct sockaddr_in *addr) { return(NmapConnect(address, addr, BONGO_QUEUE_PORT, NULL)); } Connection * -NMAPConnectQueueEx(unsigned char *address, struct sockaddr_in *addr, TraceDestination *destination) +NMAPConnectQueueEx(char *address, struct sockaddr_in *addr, TraceDestination *destination) { + UNUSED_PARAMETER(destination); + return(NmapConnect(address, addr, BONGO_QUEUE_PORT, NULL)); } BOOL -NMAPEncrypt(Connection *conn, unsigned char *response, int length, BOOL force) +NMAPEncrypt(Connection *conn, char *response, int length, BOOL force) { int ccode; BOOL result; @@ -1464,7 +1471,7 @@ NMAPEncrypt(Connection *conn, unsigned char *response, int length, BOOL force) int NMAPAuthenticateWithCookie(Connection *conn, const char *user, const char *cookie, - unsigned char *buffer, int length) + char *buffer, int length) { int ccode; @@ -1511,7 +1518,7 @@ NMAPAuthenticateThenUserAndStore(Connection *conn, unsigned char *user) * \return Whether or not we succeeded */ BOOL -NMAPAuthenticateToStore(Connection *conn, unsigned char *response, int length) +NMAPAuthenticateToStore(Connection *conn, char *response, int length) { return NMAPAuthenticate(conn, response, length); } @@ -1524,13 +1531,13 @@ NMAPAuthenticateToStore(Connection *conn, unsigned char *response, int length) * \return Whether or not we succeeded */ BOOL -NMAPAuthenticateToQueue(Connection *conn, unsigned char *response, int length) +NMAPAuthenticateToQueue(Connection *conn, char *response, int length) { return NMAPAuthenticate(conn, response, length); } BOOL -NMAPAuthenticate(Connection *conn, unsigned char *response, int length) +NMAPAuthenticate(Connection *conn, char *response, int length) { int ccode; @@ -1542,9 +1549,9 @@ NMAPAuthenticate(Connection *conn, unsigned char *response, int length) } case 4242: { - unsigned char *ptr; - unsigned char *salt; - unsigned char message[XPLHASH_MD5_LENGTH]; + char *ptr; + char *salt; + char message[XPLHASH_MD5_LENGTH]; xpl_hash_context ctx; ptr = strchr(response, '<'); @@ -1601,7 +1608,7 @@ RegisterWithQueueServer(char *queueServerIpAddress, unsigned short queueServerPo { unsigned long j; Connection *conn = NULL; - unsigned char response[CONN_BUFSIZE + 1]; + char response[CONN_BUFSIZE + 1]; NMAPLibrary.state = REGISTRATION_CONNECTING; @@ -1639,7 +1646,7 @@ RegisterWithQueueServer(char *queueServerIpAddress, unsigned short queueServerPo } RegistrationStates -QueueRegister(const unsigned char *queueAgentCn, unsigned long queueNumber, unsigned short queueAgentPort) +QueueRegister(const char *queueAgentCn, unsigned long queueNumber, unsigned short queueAgentPort) { if (!queueAgentCn) { NMAPLibrary.state = REGISTRATION_FAILED; diff --git a/src/libs/xpl/hash.c b/src/libs/xpl/hash.c index 4afa221..b60b5b6 100644 --- a/src/libs/xpl/hash.c +++ b/src/libs/xpl/hash.c @@ -104,11 +104,11 @@ XplHashFinalBytes(xpl_hash_context *context, unsigned char *buffer, size_t lengt * \param length Amount of data from buffer to be written */ void -XplHashFinal(xpl_hash_context *context, xpl_hash_stringcase strcase, unsigned char *buffer, size_t length) +XplHashFinal(xpl_hash_context *context, xpl_hash_stringcase strcase, char *buffer, size_t length) { char format[5]; unsigned char *digest; - unsigned char *p; + char *p; unsigned int i; memcpy(format, "%02X\0", 5);