Annotation of src/usr.bin/ssh/sshbuf-misc.c, Revision 1.6
1.6 ! djm 1: /* $OpenBSD: sshbuf-misc.c,v 1.5 2015/10/05 17:11:21 djm Exp $ */
1.1 djm 2: /*
3: * Copyright (c) 2011 Damien Miller
4: *
5: * Permission to use, copy, modify, and distribute this software for any
6: * purpose with or without fee is hereby granted, provided that the above
7: * copyright notice and this permission notice appear in all copies.
8: *
9: * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10: * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11: * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12: * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13: * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14: * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15: * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16: */
17:
18: #include <sys/types.h>
19: #include <sys/socket.h>
20: #include <netinet/in.h>
21: #include <errno.h>
22: #include <stdlib.h>
1.3 millert 23: #include <stdint.h>
1.1 djm 24: #include <stdio.h>
25: #include <limits.h>
26: #include <string.h>
27: #include <resolv.h>
28: #include <ctype.h>
29:
30: #include "ssherr.h"
31: #define SSHBUF_INTERNAL
32: #include "sshbuf.h"
33:
34: void
1.2 djm 35: sshbuf_dump_data(const void *s, size_t len, FILE *f)
1.1 djm 36: {
1.2 djm 37: size_t i, j;
38: const u_char *p = (const u_char *)s;
1.1 djm 39:
40: for (i = 0; i < len; i += 16) {
1.4 markus 41: fprintf(f, "%.4zu: ", i);
1.1 djm 42: for (j = i; j < i + 16; j++) {
43: if (j < len)
44: fprintf(f, "%02x ", p[j]);
45: else
46: fprintf(f, " ");
47: }
48: fprintf(f, " ");
49: for (j = i; j < i + 16; j++) {
50: if (j < len) {
51: if (isascii(p[j]) && isprint(p[j]))
52: fprintf(f, "%c", p[j]);
53: else
54: fprintf(f, ".");
55: }
56: }
57: fprintf(f, "\n");
58: }
1.2 djm 59: }
60:
61: void
62: sshbuf_dump(struct sshbuf *buf, FILE *f)
63: {
64: fprintf(f, "buffer %p len = %zu\n", buf, sshbuf_len(buf));
65: sshbuf_dump_data(sshbuf_ptr(buf), sshbuf_len(buf), f);
1.1 djm 66: }
67:
68: char *
69: sshbuf_dtob16(struct sshbuf *buf)
70: {
71: size_t i, j, len = sshbuf_len(buf);
72: const u_char *p = sshbuf_ptr(buf);
73: char *ret;
74: const char hex[] = "0123456789abcdef";
75:
76: if (len == 0)
77: return strdup("");
78: if (SIZE_MAX / 2 <= len || (ret = malloc(len * 2 + 1)) == NULL)
79: return NULL;
80: for (i = j = 0; i < len; i++) {
81: ret[j++] = hex[(p[i] >> 4) & 0xf];
82: ret[j++] = hex[p[i] & 0xf];
83: }
84: ret[j] = '\0';
85: return ret;
86: }
87:
88: char *
89: sshbuf_dtob64(struct sshbuf *buf)
90: {
91: size_t len = sshbuf_len(buf), plen;
92: const u_char *p = sshbuf_ptr(buf);
93: char *ret;
94: int r;
95:
96: if (len == 0)
97: return strdup("");
98: plen = ((len + 2) / 3) * 4 + 1;
99: if (SIZE_MAX / 2 <= len || (ret = malloc(plen)) == NULL)
100: return NULL;
101: if ((r = b64_ntop(p, len, ret, plen)) == -1) {
1.5 djm 102: explicit_bzero(ret, plen);
1.1 djm 103: free(ret);
104: return NULL;
105: }
106: return ret;
107: }
108:
109: int
110: sshbuf_b64tod(struct sshbuf *buf, const char *b64)
111: {
112: size_t plen = strlen(b64);
113: int nlen, r;
114: u_char *p;
115:
116: if (plen == 0)
117: return 0;
118: if ((p = malloc(plen)) == NULL)
119: return SSH_ERR_ALLOC_FAIL;
120: if ((nlen = b64_pton(b64, p, plen)) < 0) {
1.5 djm 121: explicit_bzero(p, plen);
1.1 djm 122: free(p);
123: return SSH_ERR_INVALID_FORMAT;
124: }
125: if ((r = sshbuf_put(buf, p, nlen)) < 0) {
1.5 djm 126: explicit_bzero(p, plen);
1.1 djm 127: free(p);
128: return r;
129: }
1.5 djm 130: explicit_bzero(p, plen);
1.1 djm 131: free(p);
132: return 0;
1.6 ! djm 133: }
! 134:
! 135: char *
! 136: sshbuf_dup_string(struct sshbuf *buf)
! 137: {
! 138: const u_char *p = NULL, *s = sshbuf_ptr(buf);
! 139: size_t l = sshbuf_len(buf);
! 140: char *r;
! 141:
! 142: if (s == NULL || l > SIZE_MAX)
! 143: return NULL;
! 144: /* accept a nul only as the last character in the buffer */
! 145: if (l > 0 && (p = memchr(s, '\0', l)) != NULL) {
! 146: if (p != s + l - 1)
! 147: return NULL;
! 148: l--; /* the nul is put back below */
! 149: }
! 150: if ((r = malloc(l + 1)) == NULL)
! 151: return NULL;
! 152: if (l > 0)
! 153: memcpy(r, s, l);
! 154: r[l] = '\0';
! 155: return r;
1.1 djm 156: }
157: