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')
break;
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. */
-
-int silc_check_line(char *buf)
-{
- /* 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;
-}
-
/* Converts string to capital characters. */
SilcBool silc_to_upper(const char *string, char *dest, SilcUInt32 dest_size)
{
int i;
- if (strlen(string) > dest_size)
+ 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]);
{
int i;
- if (strlen(string) > dest_size)
+ 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]);
{
SilcUInt32 tlen;
- if (!user && !fqdn)
+ if (!user && !fqdn) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
return 0;
+ }
memset(user, 0, user_size);
memset(fqdn, 0, fqdn_size);
- if (!string)
+ if (!string) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
return 0;
+ }
if (string[0] == '@') {
if (user)
{
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));
silc_vsnprintf(buf, sizeof(buf) - 1, fmt, args);
va_end(args);
- return strdup(buf);
+ return silc_strdup(buf);
}
/* Basic has function to hash strings. May be used with the SilcHashTable.
if ((i + 1) % 10 == 0)
cp[-1] = 0;
- return strdup(fingerprint);
+ return silc_strdup(fingerprint);
}
/* Return TRUE if the `data' is ASCII string. */
fd = open("/dev/tty", O_RDONLY);
if (fd < 0) {
- fprintf(stderr, "silc: %s\n", strerror(errno));
+ silc_set_errno_posix(errno);
return NULL;
}
fflush(stdout);
if ((read(fd, input, sizeof(input))) < 0) {
- fprintf(stderr, "silc: %s\n", strerror(errno));
+ silc_set_errno_posix(errno);
tcsetattr(fd, TCSANOW, &to_old);
return NULL;
}
if (strlen(input) <= 1) {
tcsetattr(fd, TCSANOW, &to_old);
+ silc_set_errno(SILC_ERR_EOF);
return NULL;
}
} else {
fd = open("/dev/tty", O_RDONLY);
if (fd < 0) {
- fprintf(stderr, "silc: %s\n", strerror(errno));
+ silc_set_errno_posix(errno);
return NULL;
}
fflush(stdout);
if ((read(fd, input, sizeof(input))) < 0) {
- fprintf(stderr, "silc: %s\n", strerror(errno));
+ silc_set_errno_posix(errno);
return NULL;
}
- if (strlen(input) <= 1)
+ if (strlen(input) <= 1) {
+ silc_set_errno(SILC_ERR_EOF);
return NULL;
+ }
if (strchr(input, '\n'))
*strchr(input, '\n') = '\0';
- return strdup(input);
+ return silc_strdup(input);
}
#else
return NULL;
#endif /* SILC_UNIX */
}
+
+/* Hexdump */
+
+void silc_hexdump(const unsigned char *data, SilcUInt32 data_len,
+ FILE *output)
+{
+ 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 (count)
+ fprintf(output, "%08X ", k++ * 16);
+
+ for (i = 0; i < count; i++) {
+ fprintf(output, "%02X ", data[pos + i]);
+
+ if ((i + 1) % 4 == 0)
+ fprintf(output, " ");
+ }
+
+ if (count && count < 16) {
+ int j;
+
+ 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++;
+ }
+
+ 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;
+}
+
+/* Converts binary data to HEX string */
+
+SilcBool silc_data2hex(const unsigned char *data, SilcUInt32 data_len,
+ char *hex, SilcUInt32 hex_size)
+{
+ unsigned char l, h;
+ char *cp = hex;
+ int i;
+
+ if (hex_size - 1 < data_len * 2) {
+ silc_set_errno(SILC_ERR_OVERFLOW);
+ return FALSE;
+ }
+
+ memset(hex, 0, hex_size);
+
+ for (i = 0; i < data_len; i++) {
+ l = data[i];
+ h = l >> 4;
+ l &= 0xf;
+
+ *cp++ = h + (h > 9 ? 'A' - 10 : '0');
+ *cp++ = l + (l > 9 ? 'A' - 10 : '0');
+ }
+
+ SILC_LOG_DEBUG(("HEX string: '%s'", hex));
+
+ return TRUE;
+}