X-Git-Url: http://git.silc.fi/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilcutil.c;h=870bd60613aed0e67f0143c79d570b97aa93011a;hb=306cc839060cf3f1175ddad4a7da434b6a436d09;hp=2907f2cccdff8c3f2b08cdbe9952ad920d3b831e;hpb=c85af59be50a5539cb2fd0c80cb4700feab37e4e;p=runtime.git diff --git a/lib/silcutil/silcutil.c b/lib/silcutil/silcutil.c index 2907f2cc..870bd606 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 - 2008 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,100 +20,8 @@ * These are general utility functions that doesn't belong to any specific * group of routines. */ -/* $Id$ */ - -#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. */ - -char *silc_file_read(const char *filename, uint32 *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; - - if (return_len) - *return_len = filelen; - - return buffer; -} - -/* Writes a buffer to the file. */ - -int silc_file_write(const char *filename, const char *buffer, uint32 len) -{ - int fd; - - if ((fd = creat(filename, 0644)) == -1) { - SILC_LOG_ERROR(("Cannot open file %s for writing: %s", filename, - strerror(errno))); - return -1; - } - - if ((write(fd, buffer, len)) == -1) { - SILC_LOG_ERROR(("Cannot write to file %s: %s", filename, 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, - uint32 len, int mode) -{ - int fd; - - if ((fd = creat(filename, mode)) == -1) { - SILC_LOG_ERROR(("Cannot open file %s for writing: %s", filename, - strerror(errno))); - return -1; - } - - if ((write(fd, buffer, len)) == -1) { - SILC_LOG_ERROR(("Cannot write to file %s: %s", filename, strerror(errno))); - return -1; - } - - close(fd); - - return 0; -} +#include "silcruntime.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 @@ -124,276 +31,115 @@ 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; -} - -/* Returns current time as string. */ + int i; -char *silc_get_time() -{ - time_t curtime; - char *return_time; + if (strlen(string) > dest_size) { + silc_set_errno(SILC_ERR_OVERFLOW); + return FALSE; + } - curtime = time(NULL); - return_time = ctime(&curtime); - return_time[strlen(return_time) - 1] = '\0'; + for (i = 0; i < strlen(string); i++) + dest[i] = (char)toupper((int)string[i]); - return return_time; + return TRUE; } -/* Converts string to capital characters */ +/* Converts string to lower letter characters. */ -char *silc_to_upper(char *string) +SilcBool silc_to_lower(const char *string, char *dest, SilcUInt32 dest_size) { int i; - char *ret = silc_calloc(strlen(string) + 1, sizeof(char)); - - for (i = 0; i < strlen(string); i++) - ret[i] = toupper(string[i]); - - return ret; -} - -static unsigned char pem_enc[64] = -"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - -/* Encodes data into PEM encoding. Returns NULL terminated PEM encoded - data string. Note: This is originally public domain code and is - still PD. */ -char *silc_encode_pem(unsigned char *data, uint32 len) -{ - int i, j; - uint32 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; - } + if (strlen(string) > dest_size) { + silc_set_errno(SILC_ERR_OVERFLOW); + return FALSE; } - if (char_count != 0) { - bits <<= 16 - (8 * char_count); - pem[j++] = pem_enc[bits >> 18]; - pem[j++] = pem_enc[(bits >> 12) & 0x3f]; - - if (char_count == 1) { - pem[j++] = '='; - pem[j] = '='; - } else { - pem[j++] = pem_enc[(bits >> 6) & 0x3f]; - pem[j] = '='; - } - } + for (i = 0; i < strlen(string); i++) + dest[i] = (char)tolower((int)string[i]); - return pem; + return TRUE; } -/* Same as above but puts newline ('\n') every 72 characters. */ +/* Parse userfqdn string which is in user@fqdn format. */ -char *silc_encode_pem_file(unsigned char *data, uint32 data_len) +int silc_parse_userfqdn(const char *string, + char *user, SilcUInt32 user_size, + char *fqdn, SilcUInt32 fqdn_size) { - int i, j; - uint32 len, cols; - char *pem, *pem2; - - pem = silc_encode_pem(data, data_len); - len = strlen(pem); + SilcUInt32 tlen; - pem2 = silc_calloc(len + (len / 72) + 1, sizeof(*pem2)); - - for (i = 0, j = 0, cols = 1; i < len; i++, cols++) { - if (cols == 72) { - pem2[i] = '\n'; - cols = 0; - len++; - continue; - } - - pem2[i] = pem[j++]; + if (!user && !fqdn) { + silc_set_errno(SILC_ERR_INVALID_ARGUMENT); + return 0; } - silc_free(pem); - return pem2; -} - -/* Decodes PEM into data. Returns the decoded data. Note: This is - originally public domain code and is still PD. */ + if (user) + memset(user, 0, user_size); + if (fqdn) + memset(fqdn, 0, fqdn_size); -unsigned char *silc_decode_pem(unsigned char *pem, uint32 pem_len, - uint32 *ret_len) -{ - int i, j; - uint32 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; + if (!string) { + silc_set_errno(SILC_ERR_INVALID_ARGUMENT); + return 0; } - char_count = 0; - bits = 0; - j = 0; - - if (!pem_len) - len = strlen(pem); - else - len = pem_len; - - data = silc_calloc(((len * 6) / 8), sizeof(*data)); - - for (i = 0; i < len; i++) { - c = pem[i]; - - if (c == '=') - break; - - if (c > 127 || !ialpha[c]) - continue; + if (string[0] == '@') { + if (user) + silc_strncat(user, user_size, string, strlen(string)); - bits += decoder[c]; - char_count++; - - 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; - } - } - - 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; + return 1; } - if (ret_len) - *ret_len = j; - - return data; -} - -/* 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. */ - -int silc_parse_nickname(char *string, char **nickname, char **server, - uint32 *num) -{ - uint32 tlen; - char tmp[256]; - - if (!string) - return FALSE; - - if (strchr(string, '!')) { - tlen = strcspn(string, "!"); - memset(tmp, 0, sizeof(tmp)); - memcpy(tmp, string, tlen); + if (strchr(string, '@')) { + tlen = strcspn(string, "@"); - if (num) - *num = atoi(tmp); + if (user) + silc_strncat(user, user_size, string, tlen); - if (tlen >= strlen(string)) - return FALSE; + if (fqdn) + silc_strncat(fqdn, fqdn_size, string + tlen + 1, + strlen(string) - tlen - 1); - string += tlen + 1; + return 2; } - if (strchr(string, '@')) { - tlen = strcspn(string, "@"); - - if (nickname) { - *nickname = silc_calloc(tlen + 1, sizeof(char)); - memcpy(*nickname, string, tlen); - } - - if (server) { - *server = silc_calloc((strlen(string) - tlen) + 1, sizeof(char)); - memcpy(*server, string + tlen + 1, strlen(string) - tlen - 1); - } - } else { - if (nickname) - *nickname = strdup(string); - } + if (user) + silc_strncat(user, user_size, string, strlen(string)); - return TRUE; + return 1; } /* Parses command line. At most `max_args' is taken. Rest of the line @@ -401,25 +147,34 @@ int silc_parse_nickname(char *string, char **nickname, char **server, arguments in the line. Note that the command name is counted as one argument and is saved. */ -void silc_parse_command_line(unsigned char *buffer, +void silc_parse_command_line(unsigned char *buffer, unsigned char ***parsed, - uint32 **parsed_lens, - uint32 **parsed_types, - uint32 *parsed_num, - uint32 max_args) + SilcUInt32 **parsed_lens, + SilcUInt32 **parsed_types, + SilcUInt32 *parsed_num, + SilcUInt32 max_args) { int i, len = 0; int argc = 0; - const char *cp = buffer; + const char *cp = (const char *)buffer; + char *tmp; *parsed = silc_calloc(1, sizeof(**parsed)); *parsed_lens = silc_calloc(1, sizeof(**parsed_lens)); /* Get the command first */ len = strcspn(cp, " "); - (*parsed)[0] = silc_to_upper((char *)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 + 1; + cp += len; + while (*cp == ' ') + cp++; argc++; /* Parse arguments */ @@ -430,9 +185,13 @@ void silc_parse_command_line(unsigned char *buffer, len = strcspn(cp, " "); else len = strlen(cp); - + while (len && cp[len - 1] == ' ') + len--; + if (!len) + break; + *parsed = silc_realloc(*parsed, sizeof(**parsed) * (argc + 1)); - *parsed_lens = silc_realloc(*parsed_lens, + *parsed_lens = silc_realloc(*parsed_lens, sizeof(**parsed_lens) * (argc + 1)); (*parsed)[argc] = silc_calloc(len + 1, sizeof(char)); memcpy((*parsed)[argc], cp, len); @@ -443,7 +202,8 @@ void silc_parse_command_line(unsigned char *buffer, if (strlen(cp) == 0) break; else - cp++; + while (*cp == ' ') + cp++; } } @@ -463,308 +223,283 @@ void silc_parse_command_line(unsigned char *buffer, char *silc_format(char *fmt, ...) { va_list args; - static char buf[8192]; + char buf[8192]; - memset(buf, 0, sizeof(buf)); va_start(args, fmt); - vsnprintf(buf, sizeof(buf) - 1, fmt, args); + silc_vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); - return strdup(buf); + return silc_strdup(buf); } -/* Renders ID to suitable to print for example to log file. */ - -static char rid[256]; +/* Creates fingerprint from data, usually used with SHA1 digests */ -char *silc_id_render(void *id, uint16 type) +char *silc_fingerprint(const unsigned char *data, SilcUInt32 data_len) { - char tmp[100]; - unsigned char tmps[2]; + unsigned char *fingerprint, *cp; + unsigned int len, blocks, i; - memset(rid, 0, sizeof(rid)); - switch(type) { - case SILC_ID_SERVER: - { - SilcServerID *server_id = (SilcServerID *)id; - struct in_addr ipv4; + if (!data || !data_len) { + silc_set_errno(SILC_ERR_INVALID_ARGUMENT); + return NULL; + } - if (server_id->ip.data_len > 4) { + if (data_len >= 256) + data_len = 255; - } else { - SILC_GET32_MSB(ipv4.s_addr, server_id->ip.data); - strcat(rid, inet_ntoa(ipv4)); - } + /* Align and calculate total length */ + len = ((data_len + 19) / 20) * 20; + blocks = (len / 10); + len = (len * 2) + ((blocks - 1) * 2) + (4 * blocks) + 2 + 1; - memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp), ",%d,", ntohs(server_id->port)); - strcat(rid, tmp); - SILC_PUT16_MSB(server_id->rnd, tmps); - memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp), "[%02x %02x]", tmps[0], tmps[1]); - strcat(rid, tmp); - } - break; - case SILC_ID_CLIENT: - { - SilcClientID *client_id = (SilcClientID *)id; - struct in_addr ipv4; + cp = fingerprint = silc_calloc(len, sizeof(*fingerprint)); + if (!cp) + return NULL; - if (client_id->ip.data_len > 4) { + for (i = 0; i < data_len; i++) { + silc_snprintf((char *)cp, len, "%02X", data[i]); + cp += 2; + len -= 2; - } else { - SILC_GET32_MSB(ipv4.s_addr, client_id->ip.data); - strcat(rid, inet_ntoa(ipv4)); - } + if ((i + 1) % 2 == 0) + silc_snprintf((char *)cp++, len--, " "); + if ((i + 1) % 10 == 0) + silc_snprintf((char *)cp++, len--, " "); + } + i--; + if ((i + 1) % 10 == 0) + *(--cp) = '\0'; + if ((i + 1) % 2 == 0) + *(--cp) = '\0'; - memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp), ",%02x,", client_id->rnd); - strcat(rid, tmp); - memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp), "[%02x %02x %02x %02x...]", - client_id->hash[0], client_id->hash[1], - client_id->hash[2], client_id->hash[3]); - strcat(rid, tmp); - } - break; - case SILC_ID_CHANNEL: - { - SilcChannelID *channel_id = (SilcChannelID *)id; - struct in_addr ipv4; + return (char *)fingerprint; +} - if (channel_id->ip.data_len > 4) { +/* Return TRUE if the `data' is ASCII string. */ - } else { - SILC_GET32_MSB(ipv4.s_addr, channel_id->ip.data); - strcat(rid, inet_ntoa(ipv4)); - } +SilcBool silc_string_is_ascii(const unsigned char *data, SilcUInt32 data_len) +{ + int i; - memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp), ",%d,", ntohs(channel_id->port)); - strcat(rid, tmp); - SILC_PUT16_MSB(channel_id->rnd, tmps); - memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp), "[%02x %02x]", tmps[0], tmps[1]); - strcat(rid, tmp); - } - break; + for (i = 0; i < data_len; i++) { + if (!isascii(data[i])) + return FALSE; } - return rid; + return TRUE; } -/* Compares two strings. Strings may include wildcards * and ?. - Returns TRUE if strings match. */ +/* Displays input prompt on command line and takes input data from user */ -int silc_string_compare(char *string1, char *string2) +char *silc_get_input(const char *prompt, SilcBool echo_off) { - int i; - int slen1 = strlen(string1); - int slen2 = strlen(string2); - char *tmpstr1, *tmpstr2; +#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; + } - if (!string1 || !string2) - return FALSE; + signal(SIGINT, SIG_IGN); - /* See if they are same already */ - if (!strncmp(string1, string2, strlen(string2))) - return TRUE; + /* Get terminal info */ + tcgetattr(fd, &to); + to_old = to; - 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 < slen1; i++) { - - /* * wildcard. Only one * wildcard is possible. */ - if (tmpstr1[i] == '*') - if (!strncmp(tmpstr1, tmpstr2, i)) { - memset(tmpstr2, 0, slen2); - strncpy(tmpstr2, tmpstr1, i); - 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 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; -} + /* 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); -/* Inspects the `string' for wildcards and returns regex string that can - be used by the GNU regex library. A comma (`,') in the `string' means - that the string is list. */ + memset(input, 0, sizeof(input)); -char *silc_string_regexify(const char *string) -{ - int i, len, count; - char *regex; - - len = strlen(string); - count = 4; - for (i = 0; i < len; i++) - if (string[i] == '*' || string[i] == '?') - count++; - - regex = silc_calloc(len + count, sizeof(*regex)); - - count = 0; - regex[count] = '('; - count++; - - for (i = 0; i < len; i++) { - if (string[i] == '*' || string[i] == '?') { - regex[count] = '.'; - count++; - } else if (string[i] == ',') { - regex[count] = '|'; - count++; - continue; + printf("%s", prompt); + fflush(stdout); + + if ((read(fd, input, sizeof(input))) < 0) { + silc_set_errno_posix(errno); + tcsetattr(fd, TCSANOW, &to_old); + return NULL; } - regex[count] = string[i]; - count++; - } + if (strlen(input) <= 1) { + tcsetattr(fd, TCSANOW, &to_old); + silc_set_errno(SILC_ERR_EOF); + return NULL; + } - regex[count - 1] = ')'; - regex[count] = '$'; + if (strchr(input, '\n')) + *strchr(input, '\n') = '\0'; - return regex; -} + /* Restore old terminfo */ + tcsetattr(fd, TCSANOW, &to_old); + signal(SIGINT, SIG_DFL); -/* Combines two regex strings into one regex string so that they can be - used as one by the GNU regex library. The `string2' is combine into - the `string1'. */ + 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; + } -char *silc_string_regex_combine(const char *string1, const char *string2) -{ - char *tmp; - int len1, len2; + memset(input, 0, sizeof(input)); + + printf("%s", prompt); + fflush(stdout); + + if ((read(fd, input, sizeof(input))) < 0) { + silc_set_errno_posix(errno); + return NULL; + } - len1 = strlen(string1); - len2 = strlen(string2); + if (strlen(input) <= 1) { + silc_set_errno(SILC_ERR_EOF); + return NULL; + } - tmp = silc_calloc(2 + len1 + len2, sizeof(*tmp)); - strncat(tmp, string1, len1 - 2); - strncat(tmp, "|", 1); - strncat(tmp, string2 + 1, len2 - 1); + if (strchr(input, '\n')) + *strchr(input, '\n') = '\0'; - return tmp; + return silc_strdup(input); + } +#else + return NULL; +#endif /* SILC_UNIX */ } -/* Matches the two strings and returns TRUE if the strings match. */ +/* Hexdump */ -int silc_string_regex_match(const char *regex, const char *string) +void silc_hexdump(const unsigned char *data, SilcUInt32 data_len, + FILE *output) { - regex_t preg; - int ret = FALSE; - - if (regcomp(&preg, regex, REG_NOSUB | REG_EXTENDED) < 0) - return FALSE; + 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 (regexec(&preg, string, 0, NULL, 0) == 0) - ret = TRUE; + if (count) + fprintf(output, "%08X ", k++ * 16); - regfree(&preg); + for (i = 0; i < count; i++) { + fprintf(output, "%02X ", data[pos + i]); - return ret; -} + if ((i + 1) % 4 == 0) + fprintf(output, " "); + } -/* Do regex match to the two strings `string1' and `string2'. If the - `string2' matches the `string1' this returns TRUE. */ + if (count && count < 16) { + int j; -int silc_string_match(const char *string1, const char *string2) -{ - char *s1; - int ret = FALSE; + for (j = 0; j < 16 - count; j++) { + fprintf(output, " "); + + if ((j + count + 1) % 4 == 0) + fprintf(output, " "); + } + } + + 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++; + } - s1 = silc_string_regexify(string1); - ret = silc_string_regex_match(s1, string2); - silc_free(s1); + if (count) + fprintf(output, "\n"); - return ret; + if (count < 16) + break; + } } -/* Returns the username of the user. If the global variable LOGNAME - does not exists we will get the name from the password file. */ +/* Convert hex string to data. Each hex number must have two characters. */ -char *silc_get_username() +SilcBool silc_hex2data(const char *hex, unsigned char *data, + SilcUInt32 data_size, SilcUInt32 *ret_data_len) { - char *logname = NULL; - - if (!getenv("LOGNAME")) { - fprintf(stderr, "Error: environment variable $LOGNAME not set\n"); - return NULL; + char *cp = (char *)hex; + unsigned char l, h; + int i; + + if (data_size < strlen(hex) / 2) { + silc_set_errno(SILC_ERR_OVERFLOW); + return FALSE; } - logname = strdup(getenv("LOGNAME")); - if (!logname) { - logname = getlogin(); - if (!logname) { - struct passwd *pw; + for (i = 0; i < strlen(hex) / 2; i++) { + h = *cp++; + l = *cp++; - pw = getpwuid(getuid()); - if (!pw) { - fprintf(stderr, "silc_get_username: %s\n", strerror(errno)); - return NULL; - } - - logname = strdup(pw->pw_name); - } + h -= h < 'A' ? '0' : 'A' - 10; + l -= l < 'A' ? '0' : 'A' - 10; + + data[i] = (h << 4) | (l & 0xf); } - - return logname; -} -/* Returns the real name of ther user. */ + if (ret_data_len) + *ret_data_len = i; -char *silc_get_real_name() + return TRUE; +} + +/* Converts binary data to HEX string */ + +SilcBool silc_data2hex(const unsigned char *data, SilcUInt32 data_len, + char *hex, SilcUInt32 hex_size) { - char *realname = NULL; - struct passwd *pw; - - pw = getpwuid(getuid()); - if (!pw) { - fprintf(stderr, "silc_get_username: %s\n", strerror(errno)); - return NULL; + unsigned char l, h; + char *cp = hex; + int i; + + if (hex_size - 1 < data_len * 2) { + silc_set_errno(SILC_ERR_OVERFLOW); + return FALSE; } - if (strchr(pw->pw_gecos, ',')) - *strchr(pw->pw_gecos, ',') = 0; + memset(hex, 0, hex_size); - realname = strdup(pw->pw_gecos); + for (i = 0; i < data_len; i++) { + l = data[i]; + h = l >> 4; + l &= 0xf; - return realname; + *cp++ = h + (h > 9 ? 'A' - 10 : '0'); + *cp++ = l + (l > 9 ? 'A' - 10 : '0'); + } + + return TRUE; }