X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilcutil.c;h=eb0d989e835791fd78d5e2514e1a2709cd8a3c47;hb=96d69ecd5b1e5090db05efee7c992e2b2b1e3062;hp=39b9ab1ad92eb7a79c5f297f8a70324833a9fad4;hpb=89b07a460a554eb5173fe07f09b8c51c31d53e29;p=silc.git diff --git a/lib/silcutil/silcutil.c b/lib/silcutil/silcutil.c index 39b9ab1a..eb0d989e 100644 --- a/lib/silcutil/silcutil.c +++ b/lib/silcutil/silcutil.c @@ -2,15 +2,14 @@ silcutil.c - Author: Pekka Riikonen + Author: Pekka Riikonen - Copyright (C) 1997 - 2000 Pekka Riikonen + Copyright (C) 1997 - 2007 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + the Free Software Foundation; version 2 of the License. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -21,117 +20,9 @@ * These are general utility functions that doesn't belong to any specific * group of routines. */ -/* - * $Id$ - * $Log$ - * Revision 1.1 2000/09/13 17:45:16 priikone - * Splitted SILC core library. Core library includes now only - * SILC protocol specific stuff. New utility library includes the - * old stuff from core library that is more generic purpose stuff. - * - * Revision 1.4 2000/07/19 07:04:04 priikone - * Minor bug fix in silc_encode_pem - * - * Revision 1.3 2000/07/10 05:34:40 priikone - * Added PEM encoding/decoding functions. - * - * Revision 1.2 2000/07/05 06:06:12 priikone - * Added file saving with specific mode. - * - * Revision 1.1.1.1 2000/06/27 11:36:55 priikone - * Imported from internal CVS/Added Log headers. - * - * - */ - -#include "silcincludes.h" - -/* Reads a file to a buffer. The allocated buffer is returned. Length of - the file read is returned to the return_len argument. */ +/* $Id$ */ -char *silc_file_read(const char *filename, int *return_len) -{ - int fd; - char *buffer; - int filelen; - - fd = open(filename, O_RDONLY); - if (fd < 0) { - SILC_LOG_ERROR(("Cannot open file %s: %s", filename, strerror(errno))); - return NULL; - } - - filelen = lseek(fd, (off_t)0L, SEEK_END); - if (filelen < 0) - return NULL; - if (lseek(fd, (off_t)0L, SEEK_SET) < 0) - return NULL; - - if (filelen < 0) { - SILC_LOG_ERROR(("Cannot open file %s: %s", filename, strerror(errno))); - return NULL; - } - - buffer = silc_calloc(filelen + 1, sizeof(char)); - - if ((read(fd, buffer, filelen)) == -1) { - memset(buffer, 0, sizeof(buffer)); - close(fd); - SILC_LOG_ERROR(("Cannot read from file %s: %s", filename, - strerror(errno))); - return NULL; - } - - close(fd); - buffer[filelen] = EOF; - - *return_len = filelen; - return buffer; -} - -/* Writes a buffer to the file. */ - -int silc_file_write(const char *filename, const char *buffer, int len) -{ - int fd; - - if ((fd = creat(filename, 0644)) == -1) { - SILC_LOG_ERROR(("Cannot open file %s for writing: %s", strerror(errno))); - return -1; - } - - if ((write(fd, buffer, len)) == -1) { - SILC_LOG_ERROR(("Cannot write to file %s: %s", strerror(errno))); - return -1; - } - - close(fd); - - return 0; -} - -/* Writes a buffer to the file. If the file is created specific mode is - set to the file. */ - -int silc_file_write_mode(const char *filename, const char *buffer, - int len, int mode) -{ - int fd; - - if ((fd = creat(filename, mode)) == -1) { - SILC_LOG_ERROR(("Cannot open file %s for writing: %s", strerror(errno))); - return -1; - } - - if ((write(fd, buffer, len)) == -1) { - SILC_LOG_ERROR(("Cannot write to file %s: %s", strerror(errno))); - return -1; - } - - close(fd); - - return 0; -} +#include "silc.h" /* Gets line from a buffer. Stops reading when a newline or EOF occurs. This doesn't remove the newline sign from the destination buffer. The @@ -141,409 +32,559 @@ int silc_gets(char *dest, int destlen, const char *src, int srclen, int begin) { static int start = 0; int i; - + memset(dest, 0, destlen); - + if (begin != start) start = 0; - + i = 0; for ( ; start <= srclen; i++, start++) { - if (i > destlen) + if (i > destlen) { + silc_set_errno(SILC_ERR_OVERFLOW); return -1; - + } + dest[i] = src[start]; - - if (dest[i] == EOF) + + if (dest[i] == EOF) { + silc_set_errno(SILC_ERR_EOF); return EOF; - - if (dest[i] == '\n') + } + + if (dest[i] == '\n') break; } start++; - + return start; } -/* Checks line for illegal characters. Return -1 when illegal character - were found. This is used to check for bad lines when reading data from - for example a configuration file. */ +/* Converts string to capital characters. */ -int silc_check_line(char *buf) +SilcBool silc_to_upper(const char *string, char *dest, SilcUInt32 dest_size) { - /* Illegal characters in line */ - if (strchr(buf, '#')) return -1; - if (strchr(buf, '\'')) return -1; - if (strchr(buf, '\\')) return -1; - if (strchr(buf, '\r')) return -1; - if (strchr(buf, '\a')) return -1; - if (strchr(buf, '\b')) return -1; - if (strchr(buf, '\f')) return -1; - - /* Empty line */ - if (buf[0] == '\n') - return -1; - - return 0; + int i; + + if (strlen(string) > dest_size) { + silc_set_errno(SILC_ERR_OVERFLOW); + return FALSE; + } + + for (i = 0; i < strlen(string); i++) + dest[i] = (char)toupper((int)string[i]); + + return TRUE; } -/* Returns current time as string. */ +/* Converts string to lower letter characters. */ -char *silc_get_time() +SilcBool silc_to_lower(const char *string, char *dest, SilcUInt32 dest_size) { - time_t curtime; - char *return_time; + int i; - curtime = time(NULL); - return_time = ctime(&curtime); - return_time[strlen(return_time) - 1] = '\0'; + if (strlen(string) > dest_size) { + silc_set_errno(SILC_ERR_OVERFLOW); + return FALSE; + } + + for (i = 0; i < strlen(string); i++) + dest[i] = (char)tolower((int)string[i]); - return return_time; + return TRUE; } -/* Converts string to capital characters */ +/* Parse userfqdn string which is in user@fqdn format. */ -char *silc_to_upper(char *string) +int silc_parse_userfqdn(const char *string, + char *user, SilcUInt32 user_size, + char *fqdn, SilcUInt32 fqdn_size) { - int i; - char *ret = silc_calloc(strlen(string) + 1, sizeof(char)); + SilcUInt32 tlen; - for (i = 0; i < strlen(string); i++) - ret[i] = toupper(string[i]); + if (!user && !fqdn) { + silc_set_errno(SILC_ERR_INVALID_ARGUMENT); + return 0; + } + + memset(user, 0, user_size); + memset(fqdn, 0, fqdn_size); + + if (!string) { + silc_set_errno(SILC_ERR_INVALID_ARGUMENT); + return 0; + } + + if (string[0] == '@') { + if (user) + silc_strncat(user, user_size, string, strlen(string)); + + return 1; + } + + if (strchr(string, '@')) { + tlen = strcspn(string, "@"); + + if (user) + silc_strncat(user, user_size, string, tlen); + + if (fqdn) + silc_strncat(fqdn, fqdn_size, string + tlen + 1, + strlen(string) - tlen - 1); + + return 2; + } - return ret; + if (user) + silc_strncat(user, user_size, string, strlen(string)); + + return 1; } -/* Compares two strings. Strings may include wildcards * and ?. - Returns TRUE if strings match. */ +/* Parses command line. At most `max_args' is taken. Rest of the line + will be allocated as the last argument if there are more than `max_args' + arguments in the line. Note that the command name is counted as one + argument and is saved. */ -int silc_string_compare(char *string1, char *string2) +void silc_parse_command_line(unsigned char *buffer, + unsigned char ***parsed, + SilcUInt32 **parsed_lens, + SilcUInt32 **parsed_types, + SilcUInt32 *parsed_num, + SilcUInt32 max_args) { - int i; - int slen1 = strlen(string1); - int slen2 = strlen(string2); - char *tmpstr1, *tmpstr2; + int i, len = 0; + int argc = 0; + const char *cp = (const char *)buffer; + char *tmp; - if (!string1 || !string2) - return FALSE; + *parsed = silc_calloc(1, sizeof(**parsed)); + *parsed_lens = silc_calloc(1, sizeof(**parsed_lens)); - /* See if they are same already */ - if (!strncmp(string1, string2, strlen(string2))) - return TRUE; + /* Get the command first */ + len = strcspn(cp, " "); + tmp = silc_calloc(strlen(cp) + 1, sizeof(*tmp)); + if (!tmp) + return; + silc_to_upper(cp, tmp, strlen(cp)); + (*parsed)[0] = silc_calloc(len + 1, sizeof(char)); + memcpy((*parsed)[0], tmp, len); + silc_free(tmp); + (*parsed_lens)[0] = len; + cp += len; + while (*cp == ' ') + cp++; + argc++; - if (slen2 < slen1) - if (!strchr(string1, '*')) - return FALSE; - - /* Take copies of the original strings as we will change them */ - tmpstr1 = silc_calloc(slen1 + 1, sizeof(char)); - memcpy(tmpstr1, string1, slen1); - tmpstr2 = silc_calloc(slen2 + 1, sizeof(char)); - memcpy(tmpstr2, string2, slen2); - - for (i = 0; i < slen2; i++) { - - /* * wildcard. Only one * wildcard is possible. */ - if (tmpstr1[i] == '*') - if (!strncmp(tmpstr1, tmpstr2, i)) { - memset(tmpstr2, 0, slen2); - strncpy(tmpstr2, tmpstr1, i); + /* Parse arguments */ + if (strchr(cp, ' ') || strlen(cp) != 0) { + for (i = 1; i < max_args; i++) { + + if (i != max_args - 1) + len = strcspn(cp, " "); + else + len = strlen(cp); + while (len && cp[len - 1] == ' ') + len--; + if (!len) break; - } - - /* ? wildcard */ - if (tmpstr1[i] == '?') { - if (!strncmp(tmpstr1, tmpstr2, i)) { - if (!(slen1 < i + 1)) - if (tmpstr1[i + 1] != '?' && - tmpstr1[i + 1] != tmpstr2[i + 1]) - continue; - - if (!(slen1 < slen2)) - tmpstr2[i] = '?'; - } -#if 0 - } else { - if (strncmp(tmpstr1, tmpstr2, i)) - strncpy(tmpstr2, string2, slen2); -#endif + + *parsed = silc_realloc(*parsed, sizeof(**parsed) * (argc + 1)); + *parsed_lens = silc_realloc(*parsed_lens, + sizeof(**parsed_lens) * (argc + 1)); + (*parsed)[argc] = silc_calloc(len + 1, sizeof(char)); + memcpy((*parsed)[argc], cp, len); + (*parsed_lens)[argc] = len; + argc++; + + cp += len; + if (strlen(cp) == 0) + break; + else + while (*cp == ' ') + cp++; } } - - /* if using *, remove it */ - if (strchr(tmpstr1, '*')) - *strchr(tmpstr1, '*') = 0; - - if (!strcmp(tmpstr1, tmpstr2)) { - memset(tmpstr1, 0, slen1); - memset(tmpstr2, 0, slen2); - silc_free(tmpstr1); - silc_free(tmpstr2); - return TRUE; - } - - memset(tmpstr1, 0, slen1); - memset(tmpstr2, 0, slen2); - silc_free(tmpstr1); - silc_free(tmpstr2); - return FALSE; + + /* Save argument types. Protocol defines all argument types but + this implementation makes sure that they are always in correct + order hence this simple code. */ + *parsed_types = silc_calloc(argc, sizeof(**parsed_types)); + for (i = 0; i < argc; i++) + (*parsed_types)[i] = i; + + *parsed_num = argc; } -unsigned char pem_enc[64] = -"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +/* Formats arguments to a string and returns it after allocating memory + for it. It must be remembered to free it later. */ + +char *silc_format(char *fmt, ...) +{ + va_list args; + char buf[8192]; + + memset(buf, 0, sizeof(buf)); + va_start(args, fmt); + silc_vsnprintf(buf, sizeof(buf) - 1, fmt, args); + va_end(args); + + return silc_strdup(buf); +} -/* Encodes data into PEM encoding. Returns NULL terminated PEM encoded - data string. Note: This is originally public domain code and is - still PD. */ +/* Hash a ID. The `user_context' is the ID type. */ -char *silc_encode_pem(unsigned char *data, unsigned int len) +SilcUInt32 silc_hash_id(void *key, void *user_context) { - int i, j; - unsigned int bits, c, char_count; - char *pem; - - char_count = 0; - bits = 0; - j = 0; - - pem = silc_calloc(((len * 8 + 5) / 6) + 5, sizeof(*pem)); - - for (i = 0; i < len; i++) { - c = data[i]; - bits += c; - char_count++; - - if (char_count == 3) { - pem[j++] = pem_enc[bits >> 18]; - pem[j++] = pem_enc[(bits >> 12) & 0x3f]; - pem[j++] = pem_enc[(bits >> 6) & 0x3f]; - pem[j++] = pem_enc[bits & 0x3f]; - bits = 0; - char_count = 0; - } else { - bits <<= 8; + SilcIdType id_type = (SilcIdType)SILC_PTR_TO_32(user_context); + SilcUInt32 h = 0; + int i; + + switch (id_type) { + case SILC_ID_CLIENT: + { + SilcClientID *id = (SilcClientID *)key; + + /* The client ID is hashed by hashing the hash of the ID + (which is a truncated MD5 hash of the nickname) so that we + can access the entry from the cache with both Client ID but + with just a hash from the ID as well. */ + return silc_hash_client_id_hash(id->hash, NULL); + } + break; + case SILC_ID_SERVER: + { + SilcServerID *id = (SilcServerID *)key; + + h = id->port * id->rnd; + for (i = 0; i < id->ip.data_len; i++) + h ^= id->ip.data[i]; + + return h; } + break; + case SILC_ID_CHANNEL: + { + SilcChannelID *id = (SilcChannelID *)key; + + h = id->port * id->rnd; + for (i = 0; i < id->ip.data_len; i++) + h ^= id->ip.data[i]; + + return h; + } + break; + default: + break; } - if (char_count != 0) { - bits <<= 16 - (8 * char_count); - pem[j++] = pem_enc[bits >> 18]; - pem[j++] = pem_enc[(bits >> 12) & 0x3f]; + return h; +} - if (char_count == 1) { - pem[j++] = '='; - pem[j] = '='; - } else { - pem[j++] = pem_enc[(bits >> 6) & 0x3f]; - pem[j] = '='; +/* Hash Client ID's hash. */ + +SilcUInt32 silc_hash_client_id_hash(void *key, void *user_context) +{ + int i; + unsigned char *hash = key; + SilcUInt32 h = 0, g; + + for (i = 0; i < CLIENTID_HASH_LEN; i++) { + h = (h << 4) + hash[i]; + if ((g = h & 0xf0000000)) { + h = h ^ (g >> 24); + h = h ^ g; } } - return pem; + return h; } -/* Same as above but puts newline ('\n') every 72 characters. */ +/* Compares two ID's. May be used as SilcHashTable comparison function. + The Client ID's compares only the hash of the Client ID not any other + part of the Client ID. Other ID's are fully compared. */ -char *silc_encode_pem_file(unsigned char *data, unsigned int data_len) +SilcBool silc_hash_id_compare(void *key1, void *key2, void *user_context) { - int i, j; - unsigned int len, cols; - char *pem, *pem2; + SilcIdType id_type = (SilcIdType)SILC_PTR_TO_32(user_context); + return (id_type == SILC_ID_CLIENT ? + SILC_ID_COMPARE_HASH((SilcClientID *)key1, (SilcClientID *)key2) : + SILC_ID_COMPARE_TYPE(key1, key2, id_type)); +} - pem = silc_encode_pem(data, data_len); - len = strlen(pem); +/* Compares two ID's. Compares full IDs. */ - pem2 = silc_calloc(len + (len / 72) + 1, sizeof(*pem2)); +SilcBool silc_hash_id_compare_full(void *key1, void *key2, void *user_context) +{ + SilcIdType id_type = (SilcIdType)SILC_PTR_TO_32(user_context); + return SILC_ID_COMPARE_TYPE(key1, key2, id_type); +} - for (i = 0, j = 0, cols = 1; i < len; i++, cols++) { - if (cols == 72) { - pem2[i] = '\n'; - cols = 0; - len++; - continue; - } +/* Compare two Client ID's entirely and not just the hash from the ID. */ + +SilcBool silc_hash_client_id_compare(void *key1, void *key2, + void *user_context) +{ + return SILC_ID_COMPARE_TYPE(key1, key2, SILC_ID_CLIENT); +} + +/* Creates fingerprint from data, usually used with SHA1 digests */ + +char *silc_fingerprint(const unsigned char *data, SilcUInt32 data_len) +{ + char fingerprint[64], *cp; + int i; - pem2[i] = pem[j++]; + memset(fingerprint, 0, sizeof(fingerprint)); + cp = fingerprint; + for (i = 0; i < data_len; i++) { + silc_snprintf(cp, sizeof(fingerprint), "%02X", data[i]); + cp += 2; + + if ((i + 1) % 2 == 0) + silc_snprintf(cp++, sizeof(fingerprint), " "); + + if ((i + 1) % 10 == 0) + silc_snprintf(cp++, sizeof(fingerprint), " "); } + i--; + if ((i + 1) % 2 == 0) + cp[-2] = 0; + if ((i + 1) % 10 == 0) + cp[-1] = 0; - return pem2; + return silc_strdup(fingerprint); } -/* Decodes PEM into data. Returns the decoded data. Note: This is - originally public domain code and is still PD. */ +/* Return TRUE if the `data' is ASCII string. */ -unsigned char *silc_decode_pem(unsigned char *pem, unsigned int pem_len, - unsigned int *ret_len) +SilcBool silc_string_is_ascii(const unsigned char *data, SilcUInt32 data_len) { - int i, j; - unsigned int len, c, char_count, bits; - unsigned char *data; - static char ialpha[256], decoder[256]; - - for (i = 64 - 1; i >= 0; i--) { - ialpha[pem_enc[i]] = 1; - decoder[pem_enc[i]] = i; + int i; + + for (i = 0; i < data_len; i++) { + if (!isascii(data[i])) + return FALSE; } - char_count = 0; - bits = 0; - j = 0; + return TRUE; +} - if (!pem_len) - len = strlen(pem); - else - len = pem_len; +/* Displays input prompt on command line and takes input data from user */ - data = silc_calloc(((len * 6) / 8), sizeof(*data)); +char *silc_get_input(const char *prompt, SilcBool echo_off) +{ +#ifdef SILC_UNIX + int fd; + char input[2048]; + + if (echo_off) { + char *ret = NULL; +#ifdef HAVE_TERMIOS_H + struct termios to; + struct termios to_old; + + fd = open("/dev/tty", O_RDONLY); + if (fd < 0) { + silc_set_errno_posix(errno); + return NULL; + } - for (i = 0; i < len; i++) { - c = pem[i]; + signal(SIGINT, SIG_IGN); - if (c == '=') - break; + /* Get terminal info */ + tcgetattr(fd, &to); + to_old = to; - if (c > 127 || !ialpha[c]) - continue; + /* Echo OFF, and assure we can prompt and get input */ + to.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL); + to.c_lflag |= ICANON; + to.c_cc[VMIN] = 255; + tcsetattr(fd, TCSANOW, &to); - bits += decoder[c]; - char_count++; + memset(input, 0, sizeof(input)); - if (char_count == 4) { - data[j++] = bits >> 16; - data[j++] = (bits >> 8) & 0xff; - data[j++] = bits & 0xff; - bits = 0; - char_count = 0; - } else { - bits <<= 6; + printf("%s", prompt); + fflush(stdout); + + if ((read(fd, input, sizeof(input))) < 0) { + silc_set_errno_posix(errno); + tcsetattr(fd, TCSANOW, &to_old); + return NULL; } - } - switch(char_count) { - case 1: - silc_free(data); - return NULL; - break; - case 2: - data[j++] = bits >> 10; - break; - case 3: - data[j++] = bits >> 16; - data[j++] = (bits >> 8) & 0xff; - break; - } + if (strlen(input) <= 1) { + tcsetattr(fd, TCSANOW, &to_old); + silc_set_errno(SILC_ERR_EOF); + return NULL; + } + + if (strchr(input, '\n')) + *strchr(input, '\n') = '\0'; + + /* Restore old terminfo */ + tcsetattr(fd, TCSANOW, &to_old); + signal(SIGINT, SIG_DFL); + + ret = silc_memdup(input, strlen(input)); + memset(input, 0, sizeof(input)); +#endif /* HAVE_TERMIOS_H */ + return ret; + } else { + fd = open("/dev/tty", O_RDONLY); + if (fd < 0) { + silc_set_errno_posix(errno); + return NULL; + } - if (ret_len) - *ret_len = j; + memset(input, 0, sizeof(input)); - return data; + printf("%s", prompt); + fflush(stdout); + + if ((read(fd, input, sizeof(input))) < 0) { + silc_set_errno_posix(errno); + return NULL; + } + + if (strlen(input) <= 1) { + silc_set_errno(SILC_ERR_EOF); + return NULL; + } + + if (strchr(input, '\n')) + *strchr(input, '\n') = '\0'; + + return silc_strdup(input); + } +#else + return NULL; +#endif /* SILC_UNIX */ } -/* Parse nickname string. The format may be !@ to - support multiple same nicknames. The is the final unifier if same - nickname is on same server. Note, this is only local format and server - does not know anything about these. */ +/* Hexdump */ -int silc_parse_nickname(char *string, char **nickname, char **server, - unsigned int *num) +void silc_hexdump(const unsigned char *data, SilcUInt32 data_len, + FILE *output) { - unsigned int tlen; - char tmp[256]; + int i, k; + int off, pos, count; + int len = data_len; + + k = 0; + pos = 0; + count = 16; + off = len % 16; + while (1) { + if (off) { + if ((len - pos) < 16 && (len - pos <= len - off)) + count = off; + } else { + if (pos == len) + count = 0; + } + if (off == len) + count = len; - if (!string) - return FALSE; + if (count) + fprintf(output, "%08X ", k++ * 16); - if (strchr(string, '!')) { - tlen = strcspn(string, "!"); - memset(tmp, 0, sizeof(tmp)); - memcpy(tmp, string, tlen); + for (i = 0; i < count; i++) { + fprintf(output, "%02X ", data[pos + i]); - if (num) - *num = atoi(tmp); + if ((i + 1) % 4 == 0) + fprintf(output, " "); + } - if (tlen >= strlen(string)) - return FALSE; + if (count && count < 16) { + int j; - string += tlen + 1; - } + for (j = 0; j < 16 - count; j++) { + fprintf(output, " "); - if (strchr(string, '@')) { - tlen = strcspn(string, "@"); - - if (nickname) { - *nickname = silc_calloc(tlen + 1, sizeof(char)); - memcpy(*nickname, string, tlen); + if ((j + count + 1) % 4 == 0) + fprintf(output, " "); + } } - - if (server) { - *server = silc_calloc(strlen(string) - tlen, sizeof(char)); - memcpy(*server, string + tlen + 1, strlen(string) - tlen - 1); + + for (i = 0; i < count; i++) { + char ch; + + if (data[pos] < 32 || data[pos] >= 127) + ch = '.'; + else + ch = data[pos]; + + fprintf(output, "%c", ch); + pos++; } - } else { - if (nickname) - *nickname = strdup(string); + + if (count) + fprintf(output, "\n"); + + if (count < 16) + break; } +} + +/* Convert hex string to data. Each hex number must have two characters. */ + +SilcBool silc_hex2data(const char *hex, unsigned char *data, + SilcUInt32 data_size, SilcUInt32 *ret_data_len) +{ + char *cp = (char *)hex; + unsigned char l, h; + int i; + + if (data_size < strlen(hex) / 2) { + silc_set_errno(SILC_ERR_OVERFLOW); + return FALSE; + } + + for (i = 0; i < strlen(hex) / 2; i++) { + h = *cp++; + l = *cp++; + + h -= h < 'A' ? '0' : 'A' - 10; + l -= l < 'A' ? '0' : 'A' - 10; + + data[i] = (h << 4) | (l & 0xf); + } + + if (ret_data_len) + *ret_data_len = i; + + SILC_LOG_HEXDUMP(("len %d", i), data, i); return TRUE; } -/* Parses command line. At most `max_args' is taken. Rest of the line - will be allocated as the last argument if there are more than `max_args' - arguments in the line. Note that the command name is counted as one - argument and is saved. */ +/* Converts binary data to HEX string */ -void silc_parse_command_line(unsigned char *buffer, - unsigned char ***parsed, - unsigned int **parsed_lens, - unsigned int **parsed_types, - unsigned int *parsed_num, - unsigned int max_args) +SilcBool silc_data2hex(const unsigned char *data, SilcUInt32 data_len, + char *hex, SilcUInt32 hex_size) { - int i, len = 0; - int argc = 0; - const char *cp = buffer; - - *parsed = silc_calloc(1, sizeof(**parsed)); - *parsed_lens = silc_calloc(1, sizeof(**parsed_lens)); + unsigned char l, h; + char *cp = hex; + int i; - /* Get the command first */ - len = strcspn(cp, " "); - (*parsed)[0] = silc_to_upper((char *)cp); - (*parsed_lens)[0] = len; - cp += len + 1; - argc++; + if (hex_size - 1 < data_len * 2) { + silc_set_errno(SILC_ERR_OVERFLOW); + return FALSE; + } - /* Parse arguments */ - if (strchr(cp, ' ') || strlen(cp) != 0) { - for (i = 1; i < max_args; i++) { + memset(hex, 0, hex_size); - if (i != max_args - 1) - len = strcspn(cp, " "); - else - len = strlen(cp); - - *parsed = silc_realloc(*parsed, sizeof(**parsed) * (argc + 1)); - *parsed_lens = silc_realloc(*parsed_lens, - sizeof(**parsed_lens) * (argc + 1)); - (*parsed)[argc] = silc_calloc(len + 1, sizeof(char)); - memcpy((*parsed)[argc], cp, len); - (*parsed_lens)[argc] = len; - argc++; + for (i = 0; i < data_len; i++) { + l = data[i]; + h = l >> 4; + l &= 0xf; - cp += len; - if (strlen(cp) == 0) - break; - else - cp++; - } + *cp++ = h + (h > 9 ? 'A' - 10 : '0'); + *cp++ = l + (l > 9 ? 'A' - 10 : '0'); } - /* Save argument types. Protocol defines all argument types but - this implementation makes sure that they are always in correct - order hence this simple code. */ - *parsed_types = silc_calloc(argc, sizeof(**parsed_types)); - for (i = 0; i < argc; i++) - (*parsed_types)[i] = i; + SILC_LOG_DEBUG(("HEX string: '%s'", hex)); - *parsed_num = argc; + return TRUE; }